svn rev #24427: trunk/src/lib/crypto/ crypto_tests/ krb/ krb/prng/nss/

[ghudson@MIT.EDU]

http://src.mit.edu/fisheye/changelog/krb5/?cs=24427
Commit By: ghudson
Log Message:
Fix the NSS PRNG build.  Fix the build for non-gmake make.  Revert a
no longer necessary change to lib/crypto/krb/Makefile.in.



Changed Files:
U   trunk/src/lib/crypto/crypto_tests/Makefile.in
U   trunk/src/lib/crypto/krb/Makefile.in
U   trunk/src/lib/crypto/krb/prng/nss/Makefile.in
Modified: trunk/src/lib/crypto/crypto_tests/Makefile.in
===================================================================
--- trunk/src/lib/crypto/crypto_tests/Makefile.in	2010-10-05 16:39:59 UTC (rev 24426)
+++ trunk/src/lib/crypto/crypto_tests/Makefile.in	2010-10-05 19:44:26 UTC (rev 24427)
@@ -57,13 +57,10 @@
 		t_crc t_cts t_short t_str2key t_camellia_ccm
 	$(RUN_SETUP) $(VALGRIND) ./t_nfold
 	$(RUN_SETUP) $(VALGRIND) ./t_encrypt
-ifeq ("@PRNG_ALG@","fortuna")
-		$(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
-else 
-	if [ @CRYPTO_IMPL@ != nss ]; then \
-		$(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output && diff t_prng.output $(srcdir)/t_prng.expected; \
-	fi	
-endif
+	$(RUN_SETUP) $(VALGRIND) ./t_prng <$(srcdir)/t_prng.seed >t_prng.output
+	if [ @PRNG_ALG@ = yarrow ]; then \
+		diff t_prng.output $(srcdir)/t_prng.expected; \
+	fi
 	$(RUN_SETUP) $(VALGRIND) ./t_cmac
 	$(RUN_SETUP) $(VALGRIND) ./t_hmac
 	$(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output

Modified: trunk/src/lib/crypto/krb/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/Makefile.in	2010-10-05 16:39:59 UTC (rev 24426)
+++ trunk/src/lib/crypto/krb/Makefile.in	2010-10-05 19:44:26 UTC (rev 24427)
@@ -11,8 +11,7 @@
 		-I$(srcdir)/../@CRYPTO_IMPL@/ -I$(srcdir)/../@CRYPTO_IMPL@/des		\
 		-I$(srcdir)/../@CRYPTO_IMPL@/aes -I$(srcdir)/arcfour 	\
 		-I$(srcdir)/../@CRYPTO_IMPL@/camellia \
-		-I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@ \
-		@CRYPTO_IMPL_CFLAGS@
+		-I$(srcdir)/../@CRYPTO_IMPL@/sha1 -I$(srcdir)/../@CRYPTO_IMPL@
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 DEFS=

Modified: trunk/src/lib/crypto/krb/prng/nss/Makefile.in
===================================================================
--- trunk/src/lib/crypto/krb/prng/nss/Makefile.in	2010-10-05 16:39:59 UTC (rev 24426)
+++ trunk/src/lib/crypto/krb/prng/nss/Makefile.in	2010-10-05 19:44:26 UTC (rev 24427)
@@ -1,7 +1,7 @@
 mydir=lib/crypto/krb/prng/nss
 BUILDTOP=$(REL)..$(S)..$(S)..$(S)..$(S)..
 LOCALINCLUDES = -I$(srcdir)/.. -I$(srcdir)/../.. \
-		-I$(srcdir)/../../../@CRYPTO_IMPL@
+		-I$(srcdir)/../../../@CRYPTO_IMPL@ @CRYPTO_IMPL_CFLAGS@
 DEFS=
 
 PROG_LIBPATH=-L$(TOPLIBD)