diff options
| author | Greg Hudson <ghudson@mit.edu> | 2011-04-16 13:57:47 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2011-04-16 13:57:47 +0000 |
| commit | dfa59714c28aa6d8d34f04cbcd574ad969d18a60 (patch) | |
| tree | 9666609332c463bc266fc79375bb4094be13b65c | |
| parent | e88f857c3680ea395c0bed6a82862d8ea1177221 (diff) | |
| download | krb5-dfa59714c28aa6d8d34f04cbcd574ad969d18a60.tar.gz krb5-dfa59714c28aa6d8d34f04cbcd574ad969d18a60.tar.xz krb5-dfa59714c28aa6d8d34f04cbcd574ad969d18a60.zip | |
Revert r24826. Export krb5int_nfold from libk5crypto and link t_nfold
against libk5crypto, matching the approach used in most other library
unit tests.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24882 dc483132-0cff-0310-8789-dd5450dbe970
| -rw-r--r-- | src/lib/crypto/crypto_tests/Makefile.in | 9 | ||||
| -rw-r--r-- | src/lib/crypto/crypto_tests/t_nfold.c | 3 | ||||
| -rw-r--r-- | src/lib/crypto/libk5crypto.exports | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in index 23e6c06de..555c90c64 100644 --- a/src/lib/crypto/crypto_tests/Makefile.in +++ b/src/lib/crypto/crypto_tests/Makefile.in @@ -71,11 +71,8 @@ check-unix:: t_nfold t_encrypt t_decrypt t_prf t_prng t_cmac t_hmac \ diff t_cf2.output $(srcdir)/t_cf2.expected # $(RUN_SETUP) $(VALGRIND) ./t_pkcs5 -t_nfold$(EXEEXT): t_nfold.$(OBJEXT) nfold.$(OBJEXT) $(SUPPORT_DEPLIB) - $(CC_LINK) -o $@ t_nfold.$(OBJEXT) ../krb/nfold$(DYNOBJEXT) $(SUPPORT_LIB) - -nfold.$(OBJEXT): $(srcdir)/../krb/nfold.c - $(CC) -c $(ALL_CFLAGS) $(srcdir)/../krb/nfold.c +t_nfold$(EXEEXT): t_nfold.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) + $(CC_LINK) -o $@ t_nfold.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) t_encrypt$(EXEEXT): t_encrypt.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_encrypt.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) @@ -158,7 +155,7 @@ t_cf2$(EXEEXT): t_cf2.$(OBJEXT) $(SUPPORT_DEPLIB) $(CC_LINK) -o $@ t_cf2.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB) clean:: - $(RM) t_nfold.o t_nfold nfold.$(OBJEXT) t_encrypt t_encrypt.o \ + $(RM) t_nfold.o t_nfold t_encrypt t_encrypt.o \ t_decrypt.o t_decrypt t_prng.o t_prng t_cmac.o t_cmac \ t_hmac.o t_hmac t_pkcs5.o t_pkcs5 pbkdf2.o t_prf t_prf.o \ aes-test.o aes-test vt.txt vk.txt kresults.out \ diff --git a/src/lib/crypto/crypto_tests/t_nfold.c b/src/lib/crypto/crypto_tests/t_nfold.c index 341a41ce7..b94353c22 100644 --- a/src/lib/crypto/crypto_tests/t_nfold.c +++ b/src/lib/crypto/crypto_tests/t_nfold.c @@ -29,8 +29,7 @@ #include <string.h> #include <assert.h> -void krb5int_nfold(unsigned int inbits, const unsigned char *in, - unsigned int outbits, unsigned char *out); +#include "crypto_int.h" #define ASIZE(ARRAY) (sizeof(ARRAY)/sizeof(ARRAY[0])) diff --git a/src/lib/crypto/libk5crypto.exports b/src/lib/crypto/libk5crypto.exports index 2d91592ec..b96833c90 100644 --- a/src/lib/crypto/libk5crypto.exports +++ b/src/lib/crypto/libk5crypto.exports @@ -100,3 +100,4 @@ krb5int_aes_enc_key k5_sha256_final k5_sha256_init k5_sha256_update +krb5int_nfold |