svn rev #24882: trunk/src/lib/crypto/ crypto_tests/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24882
Commit By: ghudson
Log Message:
Revert r24826.  Export krb5int_nfold from libk5crypto and link t_nfold
against libk5crypto, matching the approach used in most other library
unit tests.



Changed Files:
U   trunk/src/lib/crypto/crypto_tests/Makefile.in
U   trunk/src/lib/crypto/crypto_tests/t_nfold.c
U   trunk/src/lib/crypto/libk5crypto.exports
Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- trunk/src/lib/crypto/crypto_tests/Makefile.in	2011-04-14 22:17:10 UTC (rev 24881)
+++ trunk/src/lib/crypto/crypto_tests/Makefile.in	2011-04-16 13:57:47 UTC (rev 24882)
@@ -71,12 +71,9 @@
 	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)
+t_nfold$(EXEEXT): t_nfold.$(OBJEXT) $(CRYPTO_DEPLIB) $(SUPPORT_DEPLIB)
+	$(CC_LINK) -o $@ t_nfold.$(OBJEXT) -lkrb5 -lk5crypto -lcom_err $(SUPPORT_LIB)
 
-nfold.$(OBJEXT): $(srcdir)/../krb/nfold.c
-	$(CC) -c $(ALL_CFLAGS) $(srcdir)/../krb/nfold.c
-
 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 @@
 	$(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 \

Modified: trunk/src/lib/crypto/crypto_tests/t_nfold.c
===================================================================
--- trunk/src/lib/crypto/crypto_tests/t_nfold.c	2011-04-14 22:17:10 UTC (rev 24881)
+++ trunk/src/lib/crypto/crypto_tests/t_nfold.c	2011-04-16 13:57:47 UTC (rev 24882)
@@ -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]))
 

Modified: trunk/src/lib/crypto/libk5crypto.exports
===================================================================
--- trunk/src/lib/crypto/libk5crypto.exports	2011-04-14 22:17:10 UTC (rev 24881)
+++ trunk/src/lib/crypto/libk5crypto.exports	2011-04-16 13:57:47 UTC (rev 24882)
@@ -100,3 +100,4 @@
 k5_sha256_final
 k5_sha256_init
 k5_sha256_update
+krb5int_nfold