Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

Fix possible memory leak in openssl_encrypt and openssl_decrypt

pull/2499/head
Jakub Zelenka 9 years ago
parent
7b392c7154
commit
a0b9554f94
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      ext/openssl/openssl.c

4
ext/openssl/openssl.c
View File

@ -5699,6 +5699,7 @@ PHP_FUNCTION(openssl_encrypt)
}
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(data_len, data);
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(password_len, password);
cipher_ctx = EVP_CIPHER_CTX_new();
if (!cipher_ctx) {
@ -5726,7 +5727,6 @@ PHP_FUNCTION(openssl_encrypt)
EVP_EncryptInit(cipher_ctx, cipher_type, NULL, NULL);
if (password_len > keylen) {
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(password_len, password);
EVP_CIPHER_CTX_set_key_length(cipher_ctx, (int)password_len);
}
EVP_EncryptInit_ex(cipher_ctx, NULL, NULL, key, (unsigned char *)iv);
@ -5790,6 +5790,7 @@ PHP_FUNCTION(openssl_decrypt)
}
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(data_len, data);
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(password_len, password);
cipher_type = EVP_get_cipherbyname(method);
if (!cipher_type) {
@ -5830,7 +5831,6 @@ PHP_FUNCTION(openssl_decrypt)
EVP_DecryptInit(cipher_ctx, cipher_type, NULL, NULL);
if (password_len > keylen) {
PHP_OPENSSL_CHECK_SIZE_T_TO_INT(password_len, password);
EVP_CIPHER_CTX_set_key_length(cipher_ctx, (int)password_len);
}
EVP_DecryptInit_ex(cipher_ctx, NULL, NULL, key, (unsigned char *)iv);

Write Preview
Loading…
Cancel
Save