com php-src: Store errors in openssl_seal and openssl_o pen: ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Thu, 04 Feb 2016 12:30:53 +0000 |
| Subject: | com php-src: Store errors in openssl_seal and openssl_o pen: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92455@lists.php.net to get a copy of this message | ||
Commit: 899d2b2126b9e7fc96ebd234eb63a9f1133f7914
Author: Jakub Zelenka <bukka@php.net> Thu, 4 Feb 2016 12:30:53 +0000
Parents: 95a48213a0c81f54969b355f4974db5a24291486
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=899d2b2126b9e7fc96ebd234eb63a9f1133f7914
Log:
Store errors in openssl_seal and openssl_open
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 3010c73..04ac7e5 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -5268,8 +5268,9 @@ PHP_FUNCTION(openssl_seal)
} ZEND_HASH_FOREACH_END();
if (!EVP_EncryptInit(&ctx,cipher,NULL,NULL)) {
- RETVAL_FALSE;
EVP_CIPHER_CTX_cleanup(&ctx);
+ php_openssl_store_errors();
+ RETVAL_FALSE;
goto clean_exit;
}
@@ -5280,9 +5281,10 @@ PHP_FUNCTION(openssl_seal)
if (!EVP_SealInit(&ctx, cipher, eks, eksl, &iv_buf[0], pkeys, nkeys) ||
!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);
+ php_openssl_store_errors();
+ RETVAL_FALSE;
goto clean_exit;
}
@@ -5389,21 +5391,18 @@ PHP_FUNCTION(openssl_open)
buf = emalloc(data_len + 1);
if (EVP_OpenInit(&ctx, cipher, (unsigned char *)ekey, (int)ekey_len, iv_buf, pkey) &&
- EVP_OpenUpdate(&ctx, buf, &len1, (unsigned char *)data, (int)data_len)) {
- if (!EVP_OpenFinal(&ctx, buf + len1, &len2) || (len1 + len2 == 0)) {
- efree(buf);
- RETVAL_FALSE;
- } else {
- zval_dtor(opendata);
- buf[len1 + len2] = '\0';
- ZVAL_NEW_STR(opendata, zend_string_init((char*)buf, len1 + len2, 0));
- efree(buf);
- RETVAL_TRUE;
- }
+ EVP_OpenUpdate(&ctx, buf, &len1, (unsigned char *)data, (int)data_len) &&
+ EVP_OpenFinal(&ctx, buf + len1, &len2) && (len1 + len2 > 0)) {
+ zval_dtor(opendata);
+ buf[len1 + len2] = '\0';
+ ZVAL_NEW_STR(opendata, zend_string_init((char*)buf, len1 + len2, 0));
+ RETVAL_TRUE;
} else {
- efree(buf);
+ php_openssl_store_errors();
RETVAL_FALSE;
}
+
+ efree(buf);
if (keyresource == NULL) {
EVP_PKEY_free(pkey);
}