diff options
| author | Jakub Zelenka <bukka@php.net> | 2016-02-29 19:51:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2016-07-17 17:33:42 +0100 |
| commit | fd9142a64744958997f7c9611ef6277c57172933 (patch) | |
| tree | cd26e1c003ee0eccd46e9071ed2200cc2796a288 | |
| parent | b8164673ebde45a5df0cec5eb40cc83a371bde6f (diff) | |
| download | php-git-fd9142a64744958997f7c9611ef6277c57172933.tar.gz | |
Use opaque md ctx in openssl_sign and openssl_verify
| -rw-r--r-- | ext/openssl/openssl.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 47505d1cda..7b687e1393 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -5322,7 +5322,7 @@ PHP_FUNCTION(openssl_sign) zend_resource *keyresource = NULL; char * data; size_t data_len; - EVP_MD_CTX md_ctx; + EVP_MD_CTX *md_ctx; zval *method = NULL; zend_long signature_algo = OPENSSL_ALGO_SHA1; const EVP_MD *mdtype; @@ -5355,9 +5355,11 @@ PHP_FUNCTION(openssl_sign) siglen = EVP_PKEY_size(pkey); sigbuf = zend_string_alloc(siglen, 0); - if (EVP_SignInit(&md_ctx, mdtype) && - EVP_SignUpdate(&md_ctx, data, data_len) && - EVP_SignFinal(&md_ctx, (unsigned char*)ZSTR_VAL(sigbuf), &siglen, pkey)) { + md_ctx = EVP_MD_CTX_create(); + if (md_ctx != NULL && + EVP_SignInit(md_ctx, mdtype) && + EVP_SignUpdate(md_ctx, data, data_len) && + EVP_SignFinal(md_ctx, (unsigned char*)ZSTR_VAL(sigbuf), &siglen, pkey)) { zval_dtor(signature); ZSTR_VAL(sigbuf)[siglen] = '\0'; ZSTR_LEN(sigbuf) = siglen; @@ -5368,7 +5370,7 @@ PHP_FUNCTION(openssl_sign) efree(sigbuf); RETVAL_FALSE; } - EVP_MD_CTX_cleanup(&md_ctx); + EVP_MD_CTX_destroy(md_ctx); if (keyresource == NULL) { EVP_PKEY_free(pkey); } @@ -5382,7 +5384,7 @@ PHP_FUNCTION(openssl_verify) zval *key; EVP_PKEY *pkey; int err = 0; - EVP_MD_CTX md_ctx; + EVP_MD_CTX *md_ctx; const EVP_MD *mdtype; zend_resource *keyresource = NULL; char * data; @@ -5420,12 +5422,14 @@ PHP_FUNCTION(openssl_verify) RETURN_FALSE; } - if (!EVP_VerifyInit (&md_ctx, mdtype) || - !EVP_VerifyUpdate (&md_ctx, data, data_len) || - (err = EVP_VerifyFinal(&md_ctx, (unsigned char *)signature, (unsigned int)signature_len, pkey)) < 0) { + md_ctx = EVP_MD_CTX_create(); + if (md_ctx == NULL || + !EVP_VerifyInit (md_ctx, mdtype) || + !EVP_VerifyUpdate (md_ctx, data, data_len) || + (err = EVP_VerifyFinal(md_ctx, (unsigned char *)signature, (unsigned int)signature_len, pkey)) < 0) { php_openssl_store_errors(); } - EVP_MD_CTX_cleanup(&md_ctx); + EVP_MD_CTX_destroy(md_ctx); if (keyresource == NULL) { EVP_PKEY_free(pkey); |