com php-src: Store errors in openssl_digest: ext/openssl/ openssl.c
| From: | Jakub Zelenka | Date: | Fri, 05 Feb 2016 15:32:19 +0000 |
| Subject: | com php-src: Store errors in openssl_digest: ext/openssl/ openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-92457@lists.php.net to get a copy of this message | ||
Commit: 34eb6b53ccf5b7048e1808f5c9e48d4c8009a9c1
Author: Jakub Zelenka <bukka@php.net> Fri, 5 Feb 2016 15:32:19 +0000
Parents: 899d2b2126b9e7fc96ebd234eb63a9f1133f7914
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=34eb6b53ccf5b7048e1808f5c9e48d4c8009a9c1
Log:
Store errors in openssl_digest
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 04ac7e5..84e92d6 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -5480,9 +5480,9 @@ PHP_FUNCTION(openssl_digest)
siglen = EVP_MD_size(mdtype);
sigbuf = zend_string_alloc(siglen, 0);
- EVP_DigestInit(&md_ctx, mdtype);
- EVP_DigestUpdate(&md_ctx, (unsigned char *)data, data_len);
- if (EVP_DigestFinal (&md_ctx, (unsigned char *)ZSTR_VAL(sigbuf), &siglen)) {
+ if (EVP_DigestInit(&md_ctx, mdtype) &&
+ EVP_DigestUpdate(&md_ctx, (unsigned char *)data, data_len) &&
+ EVP_DigestFinal (&md_ctx, (unsigned char *)ZSTR_VAL(sigbuf), &siglen)) {
if (raw_output) {
ZSTR_VAL(sigbuf)[siglen] = '\0';
ZSTR_LEN(sigbuf) = siglen;
@@ -5497,6 +5497,7 @@ PHP_FUNCTION(openssl_digest)
RETVAL_STR(digest_str);
}
} else {
+ php_openssl_store_errors();
zend_string_release(sigbuf);
RETVAL_FALSE;
}