MFH

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 9637b40766a77e0530bbb88b1c3fcbab4609d46d..07856b7e0414ac57fe43d75cfaa3ba6ad1011644 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -2510,7 +2510,7 @@ PHP_FUNCTION(openssl_private_encrypt)
        cryptedlen = EVP_PKEY_size(pkey);
        cryptedbuf = emalloc(cryptedlen + 1);
 
-       switch (Z_TYPE_P(pkey)) {
+       switch (pkey->type) {
                case EVP_PKEY_RSA:
                case EVP_PKEY_RSA2:
                        successful =  (RSA_private_encrypt(data_len, 
@@ -2566,7 +2566,7 @@ PHP_FUNCTION(openssl_private_decrypt)
        cryptedlen = EVP_PKEY_size(pkey);
        crypttemp = emalloc(cryptedlen + 1);
 
-       switch (Z_TYPE_P(pkey)) {
+       switch (pkey->type) {
                case EVP_PKEY_RSA:
                case EVP_PKEY_RSA2:
                        cryptedlen = RSA_private_decrypt(data_len, 
@@ -2629,7 +2629,7 @@ PHP_FUNCTION(openssl_public_encrypt)
        cryptedlen = EVP_PKEY_size(pkey);
        cryptedbuf = emalloc(cryptedlen + 1);
 
-       switch (Z_TYPE_P(pkey)) {
+       switch (pkey->type) {
                case EVP_PKEY_RSA:
                case EVP_PKEY_RSA2:
                        successful = (RSA_public_encrypt(data_len, 
@@ -2686,7 +2686,7 @@ PHP_FUNCTION(openssl_public_decrypt)
        cryptedlen = EVP_PKEY_size(pkey);
        crypttemp = emalloc(cryptedlen + 1);
 
-       switch (Z_TYPE_P(pkey)) {
+       switch (pkey->type) {
                case EVP_PKEY_RSA:
                case EVP_PKEY_RSA2:
                        cryptedlen = RSA_public_decrypt(data_len,