| Received: | from lists.php.net ([216.92.131.4]) by iconoclast.caedmon.net with esmtp (Exim 3.35 #1 (Debian)) id 1DO0pr-0004sG-00 for <commitbot-phpcvs@phpdoc.info>; Tue, 19 Apr 2005 18:04:47 -0400 |
| Received: | from ([216.92.131.4:23880] helo=lists.php.net) by pb1.pair.com (ecelerity 1.2.12rc1 r(5476:5477)) with SMTP id E2/99-45122-F7085624 for <commitbot-phpcvs@phpdoc.info>; Tue, 19 Apr 2005 18:04:47 -0400 |
| Received: | (qmail 77027 invoked by uid 1010); 19 Apr 2005 22:04:41 -0000 |
| Received: | (qmail 77004 invoked by uid 1010); 19 Apr 2005 22:04:40 -0000 |
| X-Host-Fingerprint: | 216.92.131.4 lists.php.net |
| X-Host-Fingerprint: | 216.92.131.65 pb11.pair.com FreeBSD 4.6-4.9 |
| Mailing-List: | contact php-cvs-help@lists.php.net; run by ezmlm |
| Precedence: | bulk |
| list-help: | <mailto:php-cvs-help@lists.php.net> |
| list-unsubscribe: | <mailto:php-cvs-unsubscribe@lists.php.net> |
| list-post: | <mailto:php-cvs@lists.php.net> |
| Delivered-To: | mailing list php-cvs@lists.php.net |
| Delivered-To: | ezmlm-scan-php-cvs@lists.php.net |
| Delivered-To: | ezmlm-php-cvs@lists.php.net |
| From: | "Jani Taskinen" <sniper@php.net> |
| To: | php-cvs@lists.php.net |
| Message-ID: | <cvssniper1113948272@cvsserver> |
| Date: | Tue, 19 Apr 2005 22:04:32 -0000 |
| Subject: | [PHP-CVS] cvs: php-src /ext/openssl openssl.c |
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
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