The EVP_*Init_ex() functions take one extra argument. Let's default
authorRichard Levitte <levitte@openssl.org>
Wed, 17 Oct 2001 16:03:42 +0000 (16:03 +0000)
committerRichard Levitte <levitte@openssl.org>
Wed, 17 Oct 2001 16:03:42 +0000 (16:03 +0000)
it to NULL.

ssl/s3_clnt.c
ssl/s3_srvr.c

index e56bfb1..734659d 100644 (file)
@@ -1526,9 +1526,10 @@ 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);
+                               SSL_MAX_MASTER_KEY_LENGTH);
                        EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl);
                        outl += padl;
                        EVP_CIPHER_CTX_cleanup(&ciph_ctx);
index f858a9f..0ac44d7 100644 (file)
@@ -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);