Commit 7beb4087 authored by Richard Levitte's avatar Richard Levitte
Browse files

The EVP_*Init_ex() functions take one extra argument. Let's default 

it to NULL.
parent 51008ffc

ssl/s3_clnt.c

+3 −2
Original line number Diff line number Diff line
@@ -1526,7 +1526,8 @@ static int ssl3_send_client_key_exchange(SSL *s) 
			*/



			memset(iv, 0, EVP_MAX_IV_LENGTH);  /* per RFC 1510 */

			EVP_EncryptInit_ex(&ciph_ctx,enc, kssl_ctx->key,iv);

			EVP_EncryptInit_ex(&ciph_ctx,enc, NULL,

				kssl_ctx->key,iv);

			EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,

				SSL_MAX_MASTER_KEY_LENGTH);

			EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);

ssl/s3_srvr.c

+1 −1
Original line number Diff line number Diff line
@@ -1618,7 +1618,7 @@ static int ssl3_get_client_key_exchange(SSL *s) 


		memset(iv, 0, EVP_MAX_IV_LENGTH);	/* per RFC 1510 */



		if (!EVP_DecryptInit_ex(&ciph_ctx,enc,kssl_ctx->key,iv))

		if (!EVP_DecryptInit_ex(&ciph_ctx,enc,kssl_ctx->key,iv,NULL))

			{

			SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,

				SSL_R_DECRYPTION_FAILED);