diff options
| author | Zhanna Tsitkov <tsitkova@mit.edu> | 2010-10-05 03:18:22 +0000 |
|---|---|---|
| committer | Zhanna Tsitkov <tsitkova@mit.edu> | 2010-10-05 03:18:22 +0000 |
| commit | 4bff2d892d71f928916326e472a1d4460b083bca (patch) | |
| tree | cc32ff39034ffd6380ce9f3f85a5792f249a16f7 /src/lib/crypto/nss | |
| parent | 89773093d6b40432e007fe0042afab3891e9512d (diff) | |
| download | krb5-4bff2d892d71f928916326e472a1d4460b083bca.tar.gz krb5-4bff2d892d71f928916326e472a1d4460b083bca.tar.xz krb5-4bff2d892d71f928916326e472a1d4460b083bca.zip | |
Improves prng code modularity. Introduces fortuna-like prng that can be used in lieu of yarrow.
Yarrow stays the default prng while fortuna may be engaged during configuration by using "--with-prng-alg=fortuna" flag.
Also, nss crypto backend continues to use its own prng.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24420 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/crypto/nss')
| -rw-r--r-- | src/lib/crypto/nss/Makefile.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/lib/crypto/nss/Makefile.in b/src/lib/crypto/nss/Makefile.in index f6b457b4a..c50a74a84 100644 --- a/src/lib/crypto/nss/Makefile.in +++ b/src/lib/crypto/nss/Makefile.in @@ -1,11 +1,12 @@ mydir=lib/crypto/nss BUILDTOP=$(REL)..$(S)..$(S).. -SUBDIRS=des aes camellia md4 md5 sha1 enc_provider hash_provider +SUBDIRS=des aes camellia md4 md5 sha1 sha2 enc_provider hash_provider LOCALINCLUDES = -I$(srcdir)/../krb \ -I$(srcdir)/../krb/hash_provider \ -I$(srcdir)/des \ -I$(srcdir)/aes \ -I$(srcdir)/sha1 \ + -I$(srcdir)/sha2 \ -I$(srcdir)/md4 \ -I$(srcdir)/md5 \ -I$(srcdir)/enc_provider \ @@ -35,7 +36,7 @@ SRCS=\ $(srcdir)/pbkdf2.c STOBJLISTS= des/OBJS.ST md4/OBJS.ST \ - md5/OBJS.ST sha1/OBJS.ST \ + md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST \ enc_provider/OBJS.ST \ hash_provider/OBJS.ST \ aes/OBJS.ST \ @@ -43,7 +44,7 @@ STOBJLISTS= des/OBJS.ST md4/OBJS.ST \ OBJS.ST SUBDIROBJLISTS= des/OBJS.ST md4/OBJS.ST \ - md5/OBJS.ST sha1/OBJS.ST \ + md5/OBJS.ST sha1/OBJS.ST sha2/OBJS.ST \ enc_provider/OBJS.ST \ hash_provider/OBJS.ST \ aes/OBJS.ST \ @@ -71,6 +72,9 @@ all-windows:: cd ..\sha1 @echo Making in crypto\sha1 $(MAKE) -$(MFLAGS) + cd ..\sha2 + @echo Making in crypto\sh2a + $(MAKE) -$(MFLAGS) cd ..\hash_provider @echo Making in crypto\hash_provider $(MAKE) -$(MFLAGS) @@ -95,6 +99,9 @@ clean-windows:: cd ..\md5 @echo Making clean in crypto\md5 $(MAKE) -$(MFLAGS) clean + cd ..\sha2 + @echo Making clean in crypto\sha2 + $(MAKE) -$(MFLAGS) clean cd ..\sha1 @echo Making clean in crypto\sha1 $(MAKE) -$(MFLAGS) clean @@ -125,6 +132,9 @@ check-windows:: cd ..\sha1 @echo Making check in crypto\sha1 $(MAKE) -$(MFLAGS) check + cd ..\sha2 + @echo Making check in crypto\sha2 + $(MAKE) -$(MFLAGS) check cd ..\hash_provider @echo Making check in crypto\hash_provider $(MAKE) -$(MFLAGS) check |