From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 1 Jul 2009 11:40:19 +0000 (+0000)
Subject: Update from 1.0.0-stable
X-Git-Tag: OpenSSL-fips-2_0-rc1~1612
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a6d8ee5b5778f42b5f5d8a97784f6bbf955e083;p=thirdparty%2Fopenssl.git

Update from 1.0.0-stable
---

diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c
index 22599163ac..16afaf7fa3 100644
--- a/crypto/engine/eng_cryptodev.c
+++ b/crypto/engine/eng_cryptodev.c
@@ -625,7 +625,7 @@ static int
 bn2crparam(const BIGNUM *a, struct crparam *crp)
 {
 	int i, j, k;
-	ssize_t words, bytes, bits;
+	ssize_t bytes, bits;
 	u_char *b;
 
 	crp->crp_p = NULL;
@@ -637,6 +637,7 @@ bn2crparam(const BIGNUM *a, struct crparam *crp)
 	b = malloc(bytes);
 	if (b == NULL)
 		return (1);
+	memset(b, 0, bytes);
 
 	crp->crp_p = b;
 	crp->crp_nbits = bits;
diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 5032e7c2f0..aa565a652d 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -81,7 +81,7 @@ void OpenSSL_add_all_digests(void)
 	EVP_add_digest(EVP_dss());
 #endif
 #endif
-#ifndef OPENSSL_NO_SHA
+#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
 	EVP_add_digest(EVP_sha1());
 	EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
 	EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);