sniper Tue Apr 19 18:04:32 2005 EDT
Modified files:
/php-src/ext/openssl openssl.c
Log:
- Never use Z_TYPE* macros on non-zvals.
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.95&r2=1.96&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.95 php-src/ext/openssl/openssl.c:1.96
--- php-src/ext/openssl/openssl.c:1.95 Mon Mar 14 19:27:51 2005
+++ php-src/ext/openssl/openssl.c Tue Apr 19 18:04:25 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.95 2005/03/15 00:27:51 iliaa Exp $ */
+/* $Id: openssl.c,v 1.96 2005/04/19 22:04:25 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2611,7 +2611,7 @@
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 @@
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 @@
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 @@
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,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
