diff options
| -rw-r--r-- | ext/openssl/openssl.c | 2 | ||||
| -rw-r--r-- | ext/openssl/tests/bug61930.phpt | 24 |
2 files changed, 26 insertions, 0 deletions
diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index fd8d7deb62..c939c01b2b 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -3214,6 +3214,7 @@ PHP_FUNCTION(openssl_pkey_get_public) if (pkey == NULL) { RETURN_FALSE; } + zend_list_addref(Z_LVAL_P(return_value)); } /* }}} */ @@ -3250,6 +3251,7 @@ PHP_FUNCTION(openssl_pkey_get_private) if (pkey == NULL) { RETURN_FALSE; } + zend_list_addref(Z_LVAL_P(return_value)); } /* }}} */ diff --git a/ext/openssl/tests/bug61930.phpt b/ext/openssl/tests/bug61930.phpt new file mode 100644 index 0000000000..55dc42fded --- /dev/null +++ b/ext/openssl/tests/bug61930.phpt @@ -0,0 +1,24 @@ +--TEST-- +Bug #61930: openssl corrupts ssl key resource when using openssl_get_publickey() +--SKIPIF-- +<?php +if (!extension_loaded("openssl")) die("skip"); +?> +--FILE-- +<?php +$cert = file_get_contents(__DIR__.'/cert.crt'); + +$data = <<<DATA +Please verify me +DATA; + +$sig = 'f9Gyb6NV/ENn7GUa37ygTLcF93XHf5fbFTnoYF/O+fXbq3iChGUbET0RuhOsptlAODi6JsDLnJO4ikcVZo0tC1fFTj3LyCuPy3ZdgJbbVxQ/rviROCmuMFTqUW/Xa2LQYiapeCCgLQeWTLg7TM/BoHEkKbKLG/XT5jHvep1758A='; + +$key = openssl_get_publickey($cert); +var_dump(openssl_get_publickey($key)); +var_dump(openssl_verify($data, base64_decode($sig), $key)); +?> +--EXPECTF-- +resource(%d) of type (OpenSSL key) +int(1) + |