Commit 338a61b9 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add patch to crypto/evp which didn't apply from PR#2124

parent e4bcadb3

crypto/evp/digest.c

+6 −0
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ int EVP_DigestInit_ex(EVP_MD_CTX *ctx, const EVP_MD *type, ENGINE *impl) 
			{

			ctx->update = type->update;

			ctx->md_data=OPENSSL_malloc(type->ctx_size);

			if (ctx->md_data == NULL)

				{

				EVPerr(EVP_F_EVP_DIGESTINIT_EX,

							ERR_R_MALLOC_FAILURE);

				return 0;

				}

			}

		}

#ifndef OPENSSL_NO_ENGINE

ssl/d1_clnt.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ int dtls1_client_hello(SSL *s) 
#ifndef OPENSSL_NO_TLSEXT

		if ((p = ssl_add_clienthello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)

			{

			SSLerr(SSL_F_SSL3_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);

			SSLerr(SSL_F_DTLS1_CLIENT_HELLO,ERR_R_INTERNAL_ERROR);

			goto err;

			}

#endif

ssl/d1_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -814,7 +814,7 @@ int dtls1_send_server_hello(SSL *s) 
#ifndef OPENSSL_NO_TLSEXT

		if ((p = ssl_add_serverhello_tlsext(s, p, buf+SSL3_RT_MAX_PLAIN_LENGTH)) == NULL)

			{

			SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR);

			SSLerr(SSL_F_DTLS1_SEND_SERVER_HELLO,ERR_R_INTERNAL_ERROR);

			return -1;

			}

#endif

ssl/s3_pkt.c

+2 −2
Original line number Diff line number Diff line
@@ -789,8 +789,8 @@ static int do_ssl3_write(SSL *s, int type, const unsigned char *buf, 


	if (eivlen)

		{

		if (RAND_pseudo_bytes(p, eivlen) <= 0)

			goto err;

	/*	if (RAND_pseudo_bytes(p, eivlen) <= 0)

			goto err; */

		wr->length += eivlen;

		}

ssl/ssl.h

+1 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,7 @@ void ERR_load_SSL_strings(void); 
#define SSL_R_NO_PRIVATE_KEY_ASSIGNED			 190

#define SSL_R_NO_PROTOCOLS_AVAILABLE			 191

#define SSL_R_NO_PUBLICKEY				 192

#define SSL_R_NO_RENEGOTIATION				 339

#define SSL_R_NO_REQUIRED_DIGEST			 324

#define SSL_R_NO_SHARED_CIPHER				 193

#define SSL_R_NO_VERIFY_CALLBACK			 194