com php-src: Check EVP_SealFinal return code: ext/ope nssl/openssl.c
| From: | Jakub Zelenka | Date: | Sun, 25 Oct 2015 17:53:39 +0000 |
| Subject: | com php-src: Check EVP_SealFinal return code: ext/ope nssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89527@lists.php.net to get a copy of this message | ||
Commit: 2ee99f89544ae0ef7fded6daca6f8ba27c52f319
Author: Jakub Zelenka <bukka@php.net> Sun, 25 Oct 2015 17:53:39 +0000
Parents: ac58d21aa38ca00ab9698cecfa05c8e0ff1e8d4a
Branches: PHP-7.0
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=2ee99f89544ae0ef7fded6daca6f8ba27c52f319
Log:
Check EVP_SealFinal return code
This can be done since we no longer support OpenSSL 0.9.6
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index a2bf804..b2ae5fc 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4963,15 +4963,14 @@ PHP_FUNCTION(openssl_seal)
EVP_CIPHER_CTX_cleanup(&ctx);
if (!EVP_SealInit(&ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) ||
- !EVP_SealUpdate(&ctx, buf, &len1, (unsigned char *)data, (int)data_len)) {
+ !EVP_SealUpdate(&ctx, buf, &len1, (unsigned char *)data, (int)data_len) ||
+ !EVP_SealFinal(&ctx, buf + len1, &len2)) {
RETVAL_FALSE;
efree(buf);
EVP_CIPHER_CTX_cleanup(&ctx);
goto clean_exit;
}
- EVP_SealFinal(&ctx, buf + len1, &len2);
-
if (len1 + len2 > 0) {
zval_dtor(sealdata);
buf[len1 + len2] = '\0';