com php-src: Fix EVP_EncryptFinal and EVP_DecryptFinal : ext/openssl/openssl.c

From: Date: Sat, 26 Dec 2015 20:33:03 +0000
Subject: com php-src: Fix EVP_EncryptFinal and EVP_DecryptFinal : ext/openssl/openssl.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-92482@lists.php.net to get a copy of this message
Commit: 213844de497086e512da2d2d94b1705abd985c5a Author: Jakub Zelenka <bukka@php.net> Sat, 26 Dec 2015 20:33:03 +0000 Parents: fc3575aaf14983b9c7337e027ad73aec753997ef Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=213844de497086e512da2d2d94b1705abd985c5a Log: Fix EVP_EncryptFinal and EVP_DecryptFinal Changed paths: M ext/openssl/openssl.c Diff: diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 56c7e05..5877b9f 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5418,7 +5418,7 @@ PHP_FUNCTION(openssl_encrypt) php_openssl_cipher_update(cipher_type, cipher_ctx, &mode, &outbuf, &outlen, data, data_len, aad, aad_len, 1) == FAILURE) { RETVAL_FALSE; - } else if (EVP_EncryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + i, &i)) { + } else if (EVP_EncryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + outlen, &i)) { outlen += i; if (options & OPENSSL_RAW_DATA) { ZSTR_VAL(outbuf)[outlen] = '\0'; @@ -5521,7 +5521,7 @@ PHP_FUNCTION(openssl_decrypt) php_openssl_cipher_update(cipher_type, cipher_ctx, &mode, &outbuf, &outlen, data, data_len, aad, aad_len, 0) == FAILURE) { RETVAL_FALSE; - } else if (EVP_DecryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + i, &i)) { + } else if (EVP_DecryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + outlen, &i)) { outlen += i; ZSTR_VAL(outbuf)[outlen] = '\0'; ZSTR_LEN(outbuf) = outlen;

« previous php.cvs (#92482) next »