generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
it to NULL.
This commit is contained in:
Richard Levitte
2001-10-17 16:03:42 +00:00
parent 51008ffce1
commit 7beb408771
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ssl/s3_clnt.c
View File

@@ -1526,9 +1526,10 @@ static int ssl3_send_client_key_exchange(SSL *s)
*/ */
memset(iv, 0, EVP_MAX_IV_LENGTH); /* per RFC 1510 */ 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, EVP_EncryptUpdate(&ciph_ctx,epms,&outl,tmp_buf,
SSL_MAX_MASTER_KEY_LENGTH); SSL_MAX_MASTER_KEY_LENGTH);
EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl); EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
outl += padl; outl += padl;
EVP_CIPHER_CTX_cleanup(&ciph_ctx); EVP_CIPHER_CTX_cleanup(&ciph_ctx);

2
ssl/s3_srvr.c
View File

@@ -1618,7 +1618,7 @@ static int ssl3_get_client_key_exchange(SSL *s)
memset(iv, 0, EVP_MAX_IV_LENGTH); /* per RFC 1510 */ 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, SSLerr(SSL_F_SSL3_GET_CLIENT_KEY_EXCHANGE,
SSL_R_DECRYPTION_FAILED); SSL_R_DECRYPTION_FAILED);