svn rev #24321: branches/fortuna/src/ lib/crypto/ lib/crypto/builtin/ lib/crypto/crypto_tests/ ...
tsitkova@MIT.EDU
tsitkova at MIT.EDU
Wed Sep 15 16:07:00 EDT 2010
http://src.mit.edu/fisheye/changelog/krb5/?cs=24321
Commit By: tsitkova
Log Message:
Addition of a new Fortuna prng.
To invoke the algorithm: ./configure --with-prng-alg=fortuna.
Note that Yarrow stays the default prng.
Changed Files:
U branches/fortuna/src/Makefile.in
U branches/fortuna/src/configure.in
U branches/fortuna/src/lib/crypto/Makefile.in
U branches/fortuna/src/lib/crypto/builtin/Makefile.in
A branches/fortuna/src/lib/crypto/builtin/sha2/
U branches/fortuna/src/lib/crypto/crypto_tests/Makefile.in
U branches/fortuna/src/lib/crypto/krb/Makefile.in
A branches/fortuna/src/lib/crypto/krb/prng/
_U branches/fortuna/src/lib/crypto/krb/prng/yarrow/
D branches/fortuna/src/lib/crypto/krb/prng.c
D branches/fortuna/src/lib/crypto/krb/yarrow/
U branches/fortuna/src/lib/crypto/openssl/enc_provider/enc_provider.h
A branches/fortuna/src/lib/crypto/openssl/sha2/
U branches/fortuna/src/lib/krb5/krb/init_ctx.c
U branches/fortuna/src/util/et/deps
U branches/fortuna/src/util/ss/deps
U branches/fortuna/src/util/support/deps
Modified: branches/fortuna/src/Makefile.in
===================================================================
--- branches/fortuna/src/Makefile.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/Makefile.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -403,7 +403,8 @@
lib/crypto/krb/old/* lib/crypto/krb/raw/* \
lib/crypto/@CRYPTO_IMPL@/sha1/* lib/crypto/@CRYPTO_IMPL@/arcfour/* \
lib/crypto/@CRYPTO_IMPL@/md4/* \
- lib/crypto/@CRYPTO_IMPL@/md5/* lib/crypto/krb/yarrow/* \
+ lib/crypto/@CRYPTO_IMPL@/md5/* lib/crypto/krb/prng/* \
+ lib/crypto/krb/prng/@PRNG_ALG@/* \
lib/crypto/@CRYPTO_IMPL@/* lib/crypto/krb/* lib/crypto/crypto_tests \
lib/gssapi/* lib/gssapi/generic/* lib/gssapi/krb5/* \
lib/gssapi/mechglue/* lib/gssapi/spnego/* \
Modified: branches/fortuna/src/configure.in
===================================================================
--- branches/fortuna/src/configure.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/configure.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -125,7 +125,22 @@
], withval=builtin)
AC_CONFIG_COMMANDS(CRYPTO_IMPL, , CRYPTO_IMPL=$CRYPTO_IMPL)
AC_SUBST(CRYPTO_IMPL)
+if test "$withval" = openssl; then
+ AC_DEFINE(OPENSSL,1,[Define if OpenSSL crypto implementation is selected])
+fi
+PRNG_ALG="yarrow"
+AC_ARG_WITH([prng-alg],
+AC_HELP_STRING([--with-prng-alg=ALG], [use specified PRNG algorithm @<:@yarrow@:>@]),
+[PRNG_ALG=$withval
+AC_MSG_RESULT("k5crypto will use \'$withval\'")
+], withval=yarrow)
+AC_CONFIG_COMMANDS(PRNG_ALG, , PRNG_ALG=$PRNG_ALG)
+AC_SUBST(PRNG_ALG)
+if test "$withval" = fortuna; then
+ AC_DEFINE(FORTUNA,1,[Define if Fortuna PRNG is selected])
+fi
+
# --with-kdc-kdb-update makes the KDC update the database with last request
# information and failure information.
@@ -1082,8 +1097,12 @@
lib/crypto/$CRYPTO_IMPL/hash_provider lib/crypto/krb/checksum
lib/crypto/krb/prf lib/crypto/krb/rand2key
lib/crypto/$CRYPTO_IMPL lib/crypto/$CRYPTO_IMPL/md4 lib/crypto/$CRYPTO_IMPL/md5
- lib/crypto/krb/old lib/crypto/krb/raw lib/crypto/$CRYPTO_IMPL/sha1
- lib/crypto/krb/arcfour lib/crypto/krb/yarrow lib/crypto/$CRYPTO_IMPL/aes
+ lib/crypto/krb/old lib/crypto/krb/raw
+ lib/crypto/$CRYPTO_IMPL/sha1
+ lib/crypto/$CRYPTO_IMPL/sha2
+ lib/crypto/krb/arcfour lib/crypto/krb/prng
+ lib/crypto/krb/prng/$PRNG_ALG
+ lib/crypto/$CRYPTO_IMPL/aes
lib/crypto/$CRYPTO_IMPL/camellia lib/crypto/crypto_tests
lib/krb5 lib/krb5/error_tables lib/krb5/asn.1 lib/krb5/ccache
Modified: branches/fortuna/src/lib/crypto/Makefile.in
===================================================================
--- branches/fortuna/src/lib/crypto/Makefile.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/crypto/Makefile.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -22,9 +22,10 @@
@CRYPTO_IMPL@/enc_provider/OBJS.ST \
@CRYPTO_IMPL@/hash_provider/OBJS.ST \
krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
- krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \
+ krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST krb/prng/@PRNG_ALG@/OBJS.ST \
@CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST \
@CRYPTO_IMPL@/sha1/OBJS.ST \
+ @CRYPTO_IMPL@/sha2/OBJS.ST \
krb/arcfour/OBJS.ST \
@CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \
@CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST \
@@ -34,9 +35,10 @@
@CRYPTO_IMPL@/enc_provider/OBJS.ST \
@CRYPTO_IMPL@/hash_provider/OBJS.ST \
krb/checksum/OBJS.ST krb/prf/OBJS.ST krb/rand2key/OBJS.ST \
- krb/old/OBJS.ST krb/raw/OBJS.ST krb/yarrow/OBJS.ST \
+ krb/old/OBJS.ST krb/raw/OBJS.ST krb/prng/OBJS.ST krb/prng/@PRNG_ALG@/OBJS.ST \
@CRYPTO_IMPL@/md4/OBJS.ST @CRYPTO_IMPL@/md5/OBJS.ST \
@CRYPTO_IMPL@/sha1/OBJS.ST \
+ @CRYPTO_IMPL@/sha2/OBJS.ST \
krb/arcfour/OBJS.ST \
@CRYPTO_IMPL@/aes/OBJS.ST @CRYPTO_IMPL@/des/OBJS.ST \
@CRYPTO_IMPL@/camellia/OBJS.ST krb/OBJS.ST \
Modified: branches/fortuna/src/lib/crypto/builtin/Makefile.in
===================================================================
--- branches/fortuna/src/lib/crypto/builtin/Makefile.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/crypto/builtin/Makefile.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -1,12 +1,13 @@
mydir=lib/crypto/builtin
BUILDTOP=$(REL)..$(S)..$(S)..
-SUBDIRS=camellia des aes md4 md5 sha1 enc_provider hash_provider
+SUBDIRS=camellia des aes md4 md5 sha1 sha2 enc_provider hash_provider
LOCALINCLUDES = -I$(srcdir)/../krb \
-I$(srcdir)/../krb/hash_provider \
-I$(srcdir)/des \
-I$(srcdir)/aes \
-I$(srcdir)/camellia \
-I$(srcdir)/sha1 \
+ -I$(srcdir)/sha2 \
-I$(srcdir)/md4 \
-I$(srcdir)/md5 \
-I$(srcdir)/enc_provider \
@@ -38,7 +39,8 @@
$(srcdir)/pbkdf2.c
STOBJLISTS= des/OBJS.ST md4/OBJS.ST \
- md5/OBJS.ST sha1/OBJS.ST \
+ md5/OBJS.ST \
+ sha1/OBJS.ST sha2/OBJS.ST \
enc_provider/OBJS.ST \
hash_provider/OBJS.ST \
aes/OBJS.ST \
@@ -46,7 +48,8 @@
OBJS.ST
SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \
- md5/OBJS.ST sha1/OBJS.ST \
+ sha1/OBJS.ST sha2/OBJS.ST \
+ md5/OBJS.ST \
enc_provider/OBJS.ST \
hash_provider/OBJS.ST \
aes/OBJS.ST \
Modified: branches/fortuna/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- branches/fortuna/src/lib/crypto/crypto_tests/Makefile.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/crypto/crypto_tests/Makefile.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -3,7 +3,8 @@
LOCALINCLUDES = -I$(srcdir)/../krb -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider \
-I$(srcdir)/../@CRYPTO_IMPL@/hash_provider -I$(srcdir)/../krb/keyhash_provider \
-I$(srcdir)/../krb/dk -I$(srcdir)/../@CRYPTO_IMPL@/ \
- -I$(srcdir)/../krb/yarrow \
+ -I$(srcdir)/../krb/prng \
+ -I$(srcdir)/../krb/prng/@PRNG_ALG@ \
-I$(srcdir)/../krb/crc32 -I$(srcdir)/../krb/old -I$(srcdir)/../krb/raw \
-I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/../@CRYPTO_IMPL@/des \
-I$(srcdir)/../@CRYPTO_IMPL@/arcfour -I$(srcdir)/../@CRYPTO_IMPL@/sha1 \
@@ -53,8 +54,11 @@
t_crc t_cts t_short t_str2key t_camellia_ccm
$(RUN_SETUP) $(VALGRIND) ./t_nfold
$(RUN_SETUP) $(VALGRIND) ./t_encrypt
- $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && \
- diff t_prng.output $(srcdir)/t_prng.expected
+ifeq ("@PRNG_ALG@","fortuna")
+ $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
+else
+ $(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && diff t_prng.output $(srcdir)/t_prng.expected
+endif
$(RUN_SETUP) $(VALGRIND) ./t_cmac
$(RUN_SETUP) $(VALGRIND) ./t_hmac
$(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output
Modified: branches/fortuna/src/lib/crypto/krb/Makefile.in
===================================================================
--- branches/fortuna/src/lib/crypto/krb/Makefile.in 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/crypto/krb/Makefile.in 2010-09-15 20:07:00 UTC (rev 24321)
@@ -1,11 +1,12 @@
mydir=lib/crypto/krb
BUILDTOP=$(REL)..$(S)..$(S)..
SUBDIRS= arcfour checksum crc32 dk \
- prf rand2key old raw yarrow
+ prf rand2key old raw prng
LOCALINCLUDES = -I$(srcdir) -I$(srcdir)/../@CRYPTO_IMPL@/enc_provider -I$(srcdir)/dk \
-I$(srcdir)/../@CRYPTO_IMPL@/hash_provider \
-I$(srcdir)/prf -I$(srcdir)/rand2key \
- -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/yarrow \
+ -I$(srcdir)/old -I$(srcdir)/raw -I$(srcdir)/prng/@PRNG_ALG@ \
+ -I$(srcdir)/prng \
-I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des \
-I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/arcfour \
-I$(srcdir)/../@CRYPTO_IMPL@/camellia \
@@ -54,7 +55,6 @@
nfold.o \
old_api_glue.o \
prf.o \
- prng.o \
random_to_key.o \
state.o \
string_to_cksumtype.o \
@@ -94,7 +94,6 @@
$(OUTPRE)nfold.$(OBJEXT) \
$(OUTPRE)old_api_glue.$(OBJEXT) \
$(OUTPRE)prf.$(OBJEXT) \
- $(OUTPRE)prng.$(OBJEXT) \
$(OUTPRE)random_to_key.$(OBJEXT) \
$(OUTPRE)state.$(OBJEXT) \
$(OUTPRE)string_to_cksumtype.$(OBJEXT) \
@@ -133,7 +132,6 @@
$(srcdir)/old_api_glue.c \
$(srcdir)/prf.c \
$(srcdir)/cf2.c \
- $(srcdir)/prng.c \
$(srcdir)/random_to_key.c \
$(srcdir)/state.c \
$(srcdir)/string_to_cksumtype.c \
@@ -144,11 +142,11 @@
STOBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \
dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \
- old/OBJS.ST raw/OBJS.ST yarrow/OBJS.ST OBJS.ST
+ old/OBJS.ST raw/OBJS.ST prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST OBJS.ST
SUBDIROBJLISTS=arcfour/OBJS.ST checksum/OBJS.ST crc32/OBJS.ST \
dk/OBJS.ST prf/OBJS.ST rand2key/OBJS.ST \
- old/OBJS.ST raw/OBJS.ST yarrow/OBJS.ST
+ old/OBJS.ST raw/OBJS.ST prng/@PRNG_ALG@/OBJS.ST prng/OBJS.ST OBJS.ST
##DOS##LIBOBJS = $(OBJS)
@@ -184,8 +182,8 @@
cd ..\raw
@echo Making in crypto\raw
$(MAKE) -$(MFLAGS)
- cd ..\yarrow
- @echo Making in crypto\yarrow
+ cd ..\prng
+ @echo Making in crypto\prng
$(MAKE) -$(MFLAGS)
cd ..
@@ -214,8 +212,8 @@
cd ..\raw
@echo Making clean in crypto\raw
$(MAKE) -$(MFLAGS) clean
- cd ..\yarrow
- @echo Making clean in crypto\yarrow
+ cd ..\prng
+ @echo Making clean in crypto\prng
$(MAKE) -$(MFLAGS) clean
cd ..
@@ -244,8 +242,8 @@
cd ..\raw
@echo Making check in crypto\raw
$(MAKE) -$(MFLAGS) check
- cd ..\yarrow
- @echo Making check in crypto\yarrow
+ cd ..\prng
+ @echo Making check in crypto\prng
$(MAKE) -$(MFLAGS) check
cd ..
Modified: branches/fortuna/src/lib/crypto/openssl/enc_provider/enc_provider.h
===================================================================
--- branches/fortuna/src/lib/crypto/openssl/enc_provider/enc_provider.h 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/crypto/openssl/enc_provider/enc_provider.h 2010-09-15 20:07:00 UTC (rev 24321)
@@ -39,3 +39,8 @@
extern const struct krb5_enc_provider krb5int_enc_camellia256_ctr;
#endif
+#include <openssl/aes.h>
+#define aes_ctx AES_KEY
+#define krb5int_aes_enc_key(key, klen, ctx) AES_set_encrypt_key(key, klen * 8, ctx)
+#define aes_enc_blk AES_encrypt
+
Modified: branches/fortuna/src/lib/krb5/krb/init_ctx.c
===================================================================
--- branches/fortuna/src/lib/krb5/krb/init_ctx.c 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/lib/krb5/krb/init_ctx.c 2010-09-15 20:07:00 UTC (rev 24321)
@@ -108,12 +108,12 @@
{
krb5_context ctx = 0;
krb5_error_code retval;
+ int tmp;
struct {
krb5_int32 now, now_usec;
long pid;
} seed_data;
krb5_data seed;
- int tmp;
/* Verify some assumptions. If the assumptions hold and the
compiler is optimizing, this should result in no code being
Modified: branches/fortuna/src/util/et/deps
===================================================================
--- branches/fortuna/src/util/et/deps 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/util/et/deps 2010-09-15 20:07:00 UTC (rev 24321)
@@ -2,12 +2,12 @@
# Generated makefile dependencies follow.
#
error_message.so error_message.po $(OUTPRE)error_message.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h com_err.h error_message.c \
- error_table.h
-et_name.so et_name.po $(OUTPRE)et_name.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+ $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ com_err.h error_message.c error_table.h
+et_name.so et_name.po $(OUTPRE)et_name.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-thread.h com_err.h error_table.h \
et_name.c
-com_err.so com_err.po $(OUTPRE)com_err.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+com_err.so com_err.po $(OUTPRE)com_err.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-thread.h com_err.c com_err.h \
error_table.h
Modified: branches/fortuna/src/util/ss/deps
===================================================================
--- branches/fortuna/src/util/ss/deps 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/util/ss/deps 2010-09-15 20:07:00 UTC (rev 24321)
@@ -3,64 +3,64 @@
#
invocation.so invocation.po $(OUTPRE)invocation.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/ss/ss_err.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h copyright.h invocation.c \
ss.h ss_internal.h
help.so help.po $(OUTPRE)help.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h help.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h help.c ss.h ss_internal.h
execute_cmd.so execute_cmd.po $(OUTPRE)execute_cmd.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/ss/ss_err.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h copyright.h execute_cmd.c \
ss.h ss_internal.h
listen.so listen.po $(OUTPRE)listen.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h listen.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h listen.c ss.h ss_internal.h
parse.so parse.po $(OUTPRE)parse.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h parse.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h parse.c ss.h ss_internal.h
error.so error.po $(OUTPRE)error.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h error.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h error.c ss.h ss_internal.h
prompt.so prompt.po $(OUTPRE)prompt.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h prompt.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h prompt.c ss.h ss_internal.h
request_tbl.so request_tbl.po $(OUTPRE)request_tbl.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/ss/ss_err.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h copyright.h request_tbl.c \
ss.h ss_internal.h
list_rqs.so list_rqs.po $(OUTPRE)list_rqs.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/ss/ss_err.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h copyright.h list_rqs.c \
ss.h ss_internal.h
pager.so pager.po $(OUTPRE)pager.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h pager.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h pager.c ss.h ss_internal.h
requests.so requests.po $(OUTPRE)requests.$(OBJEXT): \
$(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/ss/ss_err.h \
- $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
+ $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h requests.c ss.h ss_internal.h
data.so data.po $(OUTPRE)data.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h data.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h data.c ss.h ss_internal.h
mk_cmds.so mk_cmds.po $(OUTPRE)mk_cmds.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h mk_cmds.c \
- ss.h ss_internal.h
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h mk_cmds.c ss.h ss_internal.h
utils.so utils.po $(OUTPRE)utils.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
- $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-platform.h \
- $(top_srcdir)/include/k5-thread.h copyright.h ss.h \
- ss_internal.h utils.c
+ $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+ copyright.h ss.h ss_internal.h utils.c
options.so options.po $(OUTPRE)options.$(OBJEXT): $(BUILDTOP)/include/ss/ss_err.h \
$(COM_ERR_DEPS) copyright.h options.c ss.h
cmd_tbl.lex.o: cmd_tbl.lex.c
Modified: branches/fortuna/src/util/support/deps
===================================================================
--- branches/fortuna/src/util/support/deps 2010-09-15 19:00:48 UTC (rev 24320)
+++ branches/fortuna/src/util/support/deps 2010-09-15 20:07:00 UTC (rev 24321)
@@ -1,52 +1,52 @@
#
# Generated makefile dependencies follow.
#
-threads.so threads.po $(OUTPRE)threads.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+threads.so threads.po $(OUTPRE)threads.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/fake-addrinfo.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/port-sockets.h \
$(top_srcdir)/include/socket-utils.h cache-addrinfo.h \
supp-int.h threads.c
init-addrinfo.so init-addrinfo.po $(OUTPRE)init-addrinfo.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/fake-addrinfo.h \
+ $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/fake-addrinfo.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
cache-addrinfo.h init-addrinfo.c
-errors.so errors.po $(OUTPRE)errors.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+errors.so errors.po $(OUTPRE)errors.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-err.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h errors.c supp-int.h
-k5buf.so k5buf.po $(OUTPRE)k5buf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+k5buf.so k5buf.po $(OUTPRE)k5buf.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h k5buf-int.h k5buf.c
gmt_mktime.so gmt_mktime.po $(OUTPRE)gmt_mktime.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/k5-gmt_mktime.h \
- gmt_mktime.c
+ $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/autoconf.h \
+ $(top_srcdir)/include/k5-gmt_mktime.h gmt_mktime.c
fake-addrinfo.so fake-addrinfo.po $(OUTPRE)fake-addrinfo.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/fake-addrinfo.h \
+ $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/fake-addrinfo.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
$(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
cache-addrinfo.h fake-addrinfo.c supp-int.h
-utf8.so utf8.po $(OUTPRE)utf8.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+utf8.so utf8.po $(OUTPRE)utf8.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
$(top_srcdir)/include/k5-utf8.h supp-int.h utf8.c
utf8_conv.so utf8_conv.po $(OUTPRE)utf8_conv.$(OBJEXT): \
- $(BUILDTOP)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
+ $(top_srcdir)/include/autoconf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h $(top_srcdir)/include/k5-utf8.h \
supp-int.h utf8_conv.c
-strlcpy.so strlcpy.po $(OUTPRE)strlcpy.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+strlcpy.so strlcpy.po $(OUTPRE)strlcpy.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
strlcpy.c
-printf.so printf.po $(OUTPRE)printf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+printf.so printf.po $(OUTPRE)printf.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
printf.c
-mkstemp.so mkstemp.po $(OUTPRE)mkstemp.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+mkstemp.so mkstemp.po $(OUTPRE)mkstemp.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
mkstemp.c
-t_k5buf.so t_k5buf.po $(OUTPRE)t_k5buf.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+t_k5buf.so t_k5buf.po $(OUTPRE)t_k5buf.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-platform.h \
$(top_srcdir)/include/k5-thread.h k5buf-int.h t_k5buf.c
-t_unal.so t_unal.po $(OUTPRE)t_unal.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+t_unal.so t_unal.po $(OUTPRE)t_unal.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
t_unal.c
-zap.so zap.po $(OUTPRE)zap.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+zap.so zap.po $(OUTPRE)zap.$(OBJEXT): $(top_srcdir)/include/autoconf.h \
$(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
zap.c
More information about the cvs-krb5
mailing list