From: foobar <sniper@php.net>
Date: Tue, 19 Apr 2005 22:04:28 +0000 (+0000)
Subject: - Never use Z_TYPE* macros on non-zvals.
X-Git-Tag: php-5.0.1b1~472
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8ac8eeca6767b4603d019d97f00d489161fca96;p=php

- Never use Z_TYPE* macros on non-zvals.
---

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index be61253c46..758e734f01 100644
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -2611,7 +2611,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, 
@@ -2669,7 +2669,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, 
@@ -2734,7 +2734,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, 
@@ -2793,7 +2793,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,