Update from 1.0.0-stable

This commit is contained in:
Dr. Stephen Henson 2009-07-01 11:40:19 +00:00
parent 9458530d45
commit 9a6d8ee5b5
2 changed files with 3 additions and 2 deletions

View file

@ -625,7 +625,7 @@ static int
bn2crparam(const BIGNUM *a, struct crparam *crp) bn2crparam(const BIGNUM *a, struct crparam *crp)
{ {
int i, j, k; int i, j, k;
ssize_t words, bytes, bits; ssize_t bytes, bits;
u_char *b; u_char *b;
crp->crp_p = NULL; crp->crp_p = NULL;
@ -637,6 +637,7 @@ bn2crparam(const BIGNUM *a, struct crparam *crp)
b = malloc(bytes); b = malloc(bytes);
if (b == NULL) if (b == NULL)
return (1); return (1);
memset(b, 0, bytes);
crp->crp_p = b; crp->crp_p = b;
crp->crp_nbits = bits; crp->crp_nbits = bits;

View file

@ -81,7 +81,7 @@ void OpenSSL_add_all_digests(void)
EVP_add_digest(EVP_dss()); EVP_add_digest(EVP_dss());
#endif #endif
#endif #endif
#ifndef OPENSSL_NO_SHA #if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
EVP_add_digest(EVP_sha1()); EVP_add_digest(EVP_sha1());
EVP_add_digest_alias(SN_sha1,"ssl3-sha1"); EVP_add_digest_alias(SN_sha1,"ssl3-sha1");
EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA); EVP_add_digest_alias(SN_sha1WithRSAEncryption,SN_sha1WithRSA);