diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-08 13:00:06 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-08 13:00:06 +0100 |
| commit | c7bcd3afa457fa2d977e20b2164b9a0c9c46d8fe (patch) | |
| tree | ce912098c23f6a1c5338adf576ed70134b77eddb | |
| parent | 4f0abd84656fdc3d1bafc2341e09318077497f3d (diff) | |
| parent | c0ce258b539af2fb75517373e5c297fb84b80daa (diff) | |
| download | php-git-c7bcd3afa457fa2d977e20b2164b9a0c9c46d8fe.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/openssl/openssl.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 942733fada..f6555b415c 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -6674,10 +6674,7 @@ PHP_OPENSSL_API zend_string* php_openssl_encrypt(char *data, size_t data_len, ch &iv, &iv_len, &free_iv, NULL, tag_len, options, 1) == FAILURE || php_openssl_cipher_update(cipher_type, cipher_ctx, &mode, &outbuf, &outlen, data, data_len, aad, aad_len, 1) == FAILURE) { - if (outbuf) - zend_string_release_ex(outbuf, 0); outbuf = NULL; - goto cleanup; } else if (EVP_EncryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + outlen, &i)) { outlen += i; if (options & OPENSSL_RAW_DATA) { @@ -6718,7 +6715,6 @@ PHP_OPENSSL_API zend_string* php_openssl_encrypt(char *data, size_t data_len, ch outbuf = NULL; } -cleanup: if (free_password) { efree(password); } @@ -6799,10 +6795,7 @@ PHP_OPENSSL_API zend_string* php_openssl_decrypt(char *data, size_t data_len, ch &iv, &iv_len, &free_iv, tag, tag_len, options, 0) == FAILURE || php_openssl_cipher_update(cipher_type, cipher_ctx, &mode, &outbuf, &outlen, data, data_len, aad, aad_len, 0) == FAILURE) { - if (outbuf) - zend_string_release_ex(outbuf, 0); outbuf = NULL; - goto cleanup; } else if (mode.is_single_run_aead || EVP_DecryptFinal(cipher_ctx, (unsigned char *)ZSTR_VAL(outbuf) + outlen, &i)) { outlen += i; @@ -6814,7 +6807,6 @@ PHP_OPENSSL_API zend_string* php_openssl_decrypt(char *data, size_t data_len, ch outbuf = NULL; } -cleanup: if (free_password) { efree(password); } |