Commit 9a6d8ee5 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Update from 1.0.0-stable

parent 9458530d

crypto/engine/eng_cryptodev.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

crypto/evp/c_alld.c

+1 −1
Original line number Diff line number Diff line
@@ -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);