diff options
| author | simon <simon@FreeBSD.org> | 2010-02-28 18:49:43 +0000 |
|---|---|---|
| committer | simon <simon@FreeBSD.org> | 2010-02-28 18:49:43 +0000 |
| commit | cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385 (patch) | |
| tree | 21770f10e7f26d05fc9b0fa96a7b6d7b107552c5 /crypto/dsa | |
| parent | 3bc8c7595d6f805f614ed860868465e3c1d3ee2b (diff) | |
| download | FreeBSD-src-cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385.zip FreeBSD-src-cdb6eef1f013e22a10ab5f5829dcdc3b5e32d385.tar.gz | |
Import OpenSSL 0.9.8m.
Diffstat (limited to 'crypto/dsa')
| -rw-r--r-- | crypto/dsa/Makefile | 5 | ||||
| -rw-r--r-- | crypto/dsa/dsa_asn1.c | 2 | ||||
| -rw-r--r-- | crypto/dsa/dsa_lib.c | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/crypto/dsa/Makefile b/crypto/dsa/Makefile index 2cc45cd..6c9578c 100644 --- a/crypto/dsa/Makefile +++ b/crypto/dsa/Makefile @@ -84,8 +84,9 @@ dsa_asn1.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h dsa_asn1.o: ../../include/openssl/fips.h ../../include/openssl/lhash.h dsa_asn1.o: ../../include/openssl/opensslconf.h dsa_asn1.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h -dsa_asn1.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -dsa_asn1.o: ../../include/openssl/symhacks.h ../cryptlib.h dsa_asn1.c +dsa_asn1.o: ../../include/openssl/rand.h ../../include/openssl/safestack.h +dsa_asn1.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h +dsa_asn1.o: ../cryptlib.h dsa_asn1.c dsa_depr.o: ../../e_os.h ../../include/openssl/asn1.h dsa_depr.o: ../../include/openssl/bio.h ../../include/openssl/bn.h dsa_depr.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h diff --git a/crypto/dsa/dsa_asn1.c b/crypto/dsa/dsa_asn1.c index 0645fac..bc7d7a0 100644 --- a/crypto/dsa/dsa_asn1.c +++ b/crypto/dsa/dsa_asn1.c @@ -62,6 +62,7 @@ #include <openssl/asn1.h> #include <openssl/asn1t.h> #include <openssl/bn.h> +#include <openssl/rand.h> #ifdef OPENSSL_FIPS #include <openssl/fips.h> #endif @@ -155,6 +156,7 @@ int DSA_sign(int type, const unsigned char *dgst, int dlen, unsigned char *sig, return 0; } #endif + RAND_seed(dgst, dlen); s=DSA_do_sign(dgst,dlen,dsa); if (s == NULL) { diff --git a/crypto/dsa/dsa_lib.c b/crypto/dsa/dsa_lib.c index 7ac9dc8..85556d1 100644 --- a/crypto/dsa/dsa_lib.c +++ b/crypto/dsa/dsa_lib.c @@ -190,7 +190,7 @@ DSA *DSA_new_method(ENGINE *engine) ret->method_mont_p=NULL; ret->references=1; - ret->flags=ret->meth->flags; + ret->flags=ret->meth->flags & ~DSA_FLAG_NON_FIPS_ALLOW; CRYPTO_new_ex_data(CRYPTO_EX_INDEX_DSA, ret, &ret->ex_data); if ((ret->meth->init != NULL) && !ret->meth->init(ret)) { |
