diff options
| author | Greg Hudson <ghudson@mit.edu> | 2010-10-02 17:21:54 +0000 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2010-10-02 17:21:54 +0000 |
| commit | 23f90e6bf3c7888ffbd59935ced87156d0be5a53 (patch) | |
| tree | fefdfab6da9cc964de26d5915140aefe53103529 /src/lib/crypto/crypto_tests | |
| parent | 1827e342c54b79566e6270f764e14e01990633ab (diff) | |
| download | krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.gz krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.tar.xz krb5-23f90e6bf3c7888ffbd59935ced87156d0be5a53.zip | |
Merge branches/nss to trunk
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24416 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/crypto_tests')
| -rw-r--r-- | src/lib/crypto/crypto_tests/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/crypto/crypto_tests/Makefile.in b/src/lib/crypto/crypto_tests/Makefile.in index a0cbb1d1b..784d30701 100644 --- a/src/lib/crypto/crypto_tests/Makefile.in +++ b/src/lib/crypto/crypto_tests/Makefile.in @@ -45,6 +45,9 @@ EXTRADEPSRCS=\ # NOTE: The t_cksum known checksum values are primarily for regression # testing. They are not derived a priori, but are known to produce # checksums that interoperate. +# +# We use the NSS PRNG when NSS is the crypto back end, so don't test +# against the expected output for Yarrow. check-unix:: t_nfold t_encrypt t_prf t_prng t_cmac t_hmac \ t_cksum4 t_cksum5 \ aes-test \ @@ -53,8 +56,9 @@ check-unix:: t_nfold t_encrypt t_prf t_prng t_cmac t_hmac \ 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 + 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 $(RUN_SETUP) $(VALGRIND) ./t_cmac $(RUN_SETUP) $(VALGRIND) ./t_hmac $(RUN_SETUP) $(VALGRIND) ./t_prf <$(srcdir)/t_prf.in >t_prf.output |