archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use opaque EVP_PKEY in php_openssl_is_private_key

Browse source
This commit is contained in:
Jakub Zelenka 2016-03-03 19:43:29 +00:00
parent 0598a8da2b
commit f1de72293e
2 changed files with 24 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
ext/openssl/openssl.c
View file

@ -3776,13 +3776,15 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey)
{
assert(pkey != NULL);
switch (pkey->type) {
switch (EVP_PKEY_id(pkey)) {
#ifndef NO_RSA
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
assert(pkey->pkey.rsa != NULL);
if (pkey->pkey.rsa != NULL && (NULL == pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q)) {
return 0;
{
RSA *rsa = EVP_PKEY_get0_RSA(pkey);
if (rsa != NULL && (rsa->p == NULL || rsa->q == NULL)) {
return 0;
}
}
break;
#endif
@ -3792,30 +3794,32 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey)
case EVP_PKEY_DSA2:
case EVP_PKEY_DSA3:
case EVP_PKEY_DSA4:
assert(pkey->pkey.dsa != NULL);
if (NULL == pkey->pkey.dsa->p || NULL == pkey->pkey.dsa->q || NULL == pkey->pkey.dsa->priv_key){
return 0;
{
DSA *dsa = EVP_PKEY_get0_DSA(pkey);
if (dsa != NULL && (dsa->p == NULL || dsa->q == NULL || dsa->priv_key == NULL)) {
return 0;
}
}
break;
#endif
#ifndef NO_DH
case EVP_PKEY_DH:
assert(pkey->pkey.dh != NULL);
if (NULL == pkey->pkey.dh->p || NULL == pkey->pkey.dh->priv_key) {
return 0;
{
DH *dh = EVP_PKEY_get0_DH(pkey);
if (dh != NULL && (NULL == dh->p || dh->priv_key == NULL)) {
return 0;
}
}
break;
#endif
#ifdef HAVE_EVP_PKEY_EC
case EVP_PKEY_EC:
assert(pkey->pkey.ec != NULL);
if ( NULL == EC_KEY_get0_private_key(pkey->pkey.ec)) {
return 0;
{
EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey);
if (ec != NULL && NULL == EC_KEY_get0_private_key(ec)) {
return 0;
}
}
break;
#endif
default:
php_error_docref(NULL, E_WARNING, "key type not supported in this PHP build!");

3
ext/openssl/php_openssl.h
View file

@ -134,6 +134,9 @@ PHP_FUNCTION(openssl_get_cert_locations);
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define EVP_PKEY_get0_RSA(_pkey) _pkey->pkey.rsa
#define EVP_PKEY_get0_DSA(_pkey) _pkey->pkey.dsa
#define EVP_PKEY_get0_DH(_pkey) _pkey->pkey.dh
#define EVP_PKEY_get0_EC_KEY(_pkey) _pkey->pkey.ec
#endif
#endif