com php-src: Check and use correct signature_len type for EVP_VerifyFinal: ext/openssl/openssl.c
| From: | Jakub Zelenka | Date: | Mon, 17 Aug 2015 17:43:02 +0000 |
| Subject: | com php-src: Check and use correct signature_len type for EVP_VerifyFinal: ext/openssl/openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-88568@lists.php.net to get a copy of this message | ||
Commit: c4a98e876c109ab4f80fbb4247ba11a31e037c41
Author: Jakub Zelenka <bukka@php.net> Mon, 17 Aug 2015 18:43:02 +0100
Parents: b28758f25395ef368d0f7de9fad1973d6d44d919
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c4a98e876c109ab4f80fbb4247ba11a31e037c41
Log:
Check and use correct signature_len type for EVP_VerifyFinal
Changed paths:
M ext/openssl/openssl.c
Diff:
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index b09f174..1608e5d 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -4822,6 +4822,10 @@ PHP_FUNCTION(openssl_verify)
return;
}
+ if (UINT_MAX < signature_len) {
+ php_error_docref(NULL, E_WARNING, "signature is too long");
+ RETURN_FALSE;
+ }
if (method == NULL || Z_TYPE_P(method) == IS_LONG) {
if (method != NULL) {
signature_algo = Z_LVAL_P(method);
@@ -4846,7 +4850,7 @@ PHP_FUNCTION(openssl_verify)
EVP_VerifyInit (&md_ctx, mdtype);
EVP_VerifyUpdate (&md_ctx, data, data_len);
- err = EVP_VerifyFinal (&md_ctx, (unsigned char *)signature, (int)signature_len, pkey);
+ err = EVP_VerifyFinal(&md_ctx, (unsigned char *)signature, (unsigned int)signature_len, pkey);
EVP_MD_CTX_cleanup(&md_ctx);
if (keyresource == NULL) {