diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2003-12-21 18:17:20 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2003-12-21 18:17:20 +0000 |
| commit | cba426ca138d051ccee81750ac0b6344fceb8fcb (patch) | |
| tree | fe446b37a78aedecb38e8e94115233f636cd528a /ext/openssl/openssl.c | |
| parent | ebeedaf6f5e2ed10a3b57e1403cb6562f38cdc73 (diff) | |
| download | php-git-cba426ca138d051ccee81750ac0b6344fceb8fcb.tar.gz | |
Fixed uninitialized usage of mdtype when unknown signature algorithm is
found.
Diffstat (limited to 'ext/openssl/openssl.c')
| -rw-r--r-- | ext/openssl/openssl.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index 2e37f75741..0b640315ea 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -2838,9 +2838,6 @@ PHP_FUNCTION(openssl_sign) RETURN_FALSE; } - siglen = EVP_PKEY_size(pkey); - sigbuf = emalloc(siglen + 1); - switch (signature_algo) { case OPENSSL_ALGO_SHA1: mdtype = (EVP_MD *) EVP_sha1(); @@ -2854,8 +2851,15 @@ PHP_FUNCTION(openssl_sign) case OPENSSL_ALGO_MD2: mdtype = (EVP_MD *) EVP_md2(); break; + default: + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown signature algorithm."); + RETURN_FALSE; + break; } - + + siglen = EVP_PKEY_size(pkey); + sigbuf = emalloc(siglen + 1); + EVP_SignInit(&md_ctx, mdtype); EVP_SignUpdate(&md_ctx, data, data_len); if (EVP_SignFinal (&md_ctx, sigbuf, &siglen, pkey)) { |