From d0f6a5bb4efd65bd30d116835ec9f33f11738bef Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 13 May 2004 04:38:58 +0000 Subject: [PATCH] Link test programs against thread support library git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16332 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/crypto/ChangeLog | 5 +++++ src/lib/crypto/Makefile.in | 12 ++++++------ src/lib/crypto/aes/ChangeLog | 5 +++++ src/lib/crypto/aes/Makefile.in | 2 +- src/lib/crypto/des/ChangeLog | 5 +++++ src/lib/crypto/des/Makefile.in | 8 ++++---- src/lib/crypto/keyhash_provider/ChangeLog | 5 +++++ src/lib/crypto/keyhash_provider/Makefile.in | 4 ++-- 8 files changed, 33 insertions(+), 13 deletions(-) diff --git a/src/lib/crypto/ChangeLog b/src/lib/crypto/ChangeLog index aa34731f5..390f8188a 100644 --- a/src/lib/crypto/ChangeLog +++ b/src/lib/crypto/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Ken Raeburn + + * Makefile.in (t_encrypt, t_prng, t_hmac, t_pkcs5, vectors, + t_cts): Link test programs against thread support library. + 2004-05-12 Ken Raeburn * libk5crypto.exports: Add the DES tables back in; libdes425 uses diff --git a/src/lib/crypto/Makefile.in b/src/lib/crypto/Makefile.in index 3421ffa18..4670684c5 100644 --- a/src/lib/crypto/Makefile.in +++ b/src/lib/crypto/Makefile.in @@ -183,23 +183,23 @@ t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(CC_LINK) -o $@ t_nfold.$(OBJEXT) nfold.$(OBJEXT) t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) nfold.$(OBJEXT) $(CRYPTO_DEPLIB) - $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err + $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) t_prng$(EXEEXT): t_prng.$(OBJEXT) - $(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err + $(CC_LINK) -o $@ t_prng.$(OBJEXT) -lk5crypto -lcom_err $(SUPPORT_LIB) t_hmac$(EXEEXT): t_hmac.$(OBJEXT) $(CRYPTO_DEPLIB) - $(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) + $(CC_LINK) -o $@ t_hmac.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) t_pkcs5$(EXEEXT): t_pkcs5.$(OBJEXT) $(CRYPTO_DEPLIB) - $(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) + $(CC_LINK) -o $@ t_pkcs5.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) vectors$(EXEEXT): vectors.$(OBJEXT) $(CRYPTO_DEPLIB) - $(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) + $(CC_LINK) -o $@ vectors.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) t_cts$(EXEEXT): t_cts.$(OBJEXT) $(CRYPTO_DEPLIB) $(CC_LINK) -o $@ t_cts.$(OBJEXT) \ - $(K5CRYPTO_LIB) $(COM_ERR_LIB) + $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) clean:: diff --git a/src/lib/crypto/aes/ChangeLog b/src/lib/crypto/aes/ChangeLog index 9e91cafd0..033ae9bc3 100644 --- a/src/lib/crypto/aes/ChangeLog +++ b/src/lib/crypto/aes/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Ken Raeburn + + * Makefile.in (aes-test): Link test program against thread support + library. + 2004-05-07 Ken Raeburn * aesopt.h (PLATFORM_BYTE_ORDER): Check for _MIPSEB, _MIPSEL. If diff --git a/src/lib/crypto/aes/Makefile.in b/src/lib/crypto/aes/Makefile.in index 84b9f68e4..ce3e4bdbd 100644 --- a/src/lib/crypto/aes/Makefile.in +++ b/src/lib/crypto/aes/Makefile.in @@ -53,7 +53,7 @@ run-aes-gen: aes-gen check:: run-aes-gen aes-test: aes-test.$(OBJEXT) $(CRYPTO_DEPLIB) - $(CC_LINK) -o aes-test aes-test.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) + $(CC_LINK) -o aes-test aes-test.$(OBJEXT) $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) check:: run-aes-test run-aes-test: aes-test diff --git a/src/lib/crypto/des/ChangeLog b/src/lib/crypto/des/ChangeLog index faba39650..043061909 100644 --- a/src/lib/crypto/des/ChangeLog +++ b/src/lib/crypto/des/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Ken Raeburn + + * Makefile.in (verify, t_afss2k): Link test programs against + thread support library. + 2004-04-02 Ken Raeburn * string2key.c: Replaced with a new implementation. diff --git a/src/lib/crypto/des/Makefile.in b/src/lib/crypto/des/Makefile.in index a701a589d..f5f18a473 100644 --- a/src/lib/crypto/des/Makefile.in +++ b/src/lib/crypto/des/Makefile.in @@ -61,9 +61,9 @@ TOBJS = $(OUTPRE)key_sched.$(OBJEXT) $(OUTPRE)f_sched.$(OBJEXT) $(OUTPRE)f_cbc.$ $(OUTPRE)f_tables.$(OBJEXT) $(OUTPRE)f_cksum.$(OBJEXT) verify$(EXEEXT): t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ - $(COM_ERR_DEPLIB) + $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_verify.$(OBJEXT) $(TOBJS) f_parity.$(OBJEXT) \ - -lcom_err + -lcom_err $(SUPPORT_LIB) destest$(EXEEXT): destest.$(OBJEXT) $(TOBJS) $(CC_LINK) -o $@ destest.$(OBJEXT) $(TOBJS) @@ -72,8 +72,8 @@ TAFSS2KOBJS = \ t_afss2k.$(OBJEXT) $(TOBJS) \ afsstring2key.$(OBJEXT) f_parity.$(OBJEXT) weak_key.$(OBJEXT) -t_afss2k$(EXEEXT): $(TAFSS2KOBJS) $(COM_ERR_DEPLIB) - $(CC_LINK) -o $@ $(TAFSS2KOBJS) -lcom_err +t_afss2k$(EXEEXT): $(TAFSS2KOBJS) $(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ $(TAFSS2KOBJS) -lcom_err $(SUPPORT_LIB) check-unix:: verify destest t_afss2k $(RUN_SETUP) ./verify -z diff --git a/src/lib/crypto/keyhash_provider/ChangeLog b/src/lib/crypto/keyhash_provider/ChangeLog index accfb953d..6f442b1f3 100644 --- a/src/lib/crypto/keyhash_provider/ChangeLog +++ b/src/lib/crypto/keyhash_provider/ChangeLog @@ -1,3 +1,8 @@ +2004-05-13 Ken Raeburn + + * Makefile.in (t_cksum4, t_cksum5): Link test programs against + thread support library. + 2003-12-19 Ken Raeburn * descbc.c (mit_des_zeroblock): Don't define here. diff --git a/src/lib/crypto/keyhash_provider/Makefile.in b/src/lib/crypto/keyhash_provider/Makefile.in index af565f97e..f67a476bf 100644 --- a/src/lib/crypto/keyhash_provider/Makefile.in +++ b/src/lib/crypto/keyhash_provider/Makefile.in @@ -36,10 +36,10 @@ t_cksum5.o: $(srcdir)/t_cksum.c $(CC) -DMD=5 $(ALL_CFLAGS) -o t_cksum5.o -c $(srcdir)/t_cksum.c t_cksum4: t_cksum4.o $(CRYTPO_DEPLIB) - $(CC_LINK) -o t_cksum4 t_cksum4.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(LIBS) + $(CC_LINK) -o t_cksum4 t_cksum4.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) t_cksum5: t_cksum5.o $(CRYPTO_DEPLIB) - $(CC_LINK) -o t_cksum5 t_cksum5.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(LIBS) + $(CC_LINK) -o t_cksum5 t_cksum5.o $(K5CRYPTO_LIB) $(COM_ERR_LIB) $(SUPPORT_LIB) $(LIBS) check-unix:: t_cksum4 t_cksum5 $(RUN_SETUP) $(C)t_cksum4 "this is a test" -- 2.26.2