cvs: php-src(PHP_4_3) /ext/openssl openssl.c
| From: | Jani Taskinen | Date: | Tue, 19 Apr 2005 22:06:46 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/openssl openssl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31488@lists.php.net to get a copy of this message | ||
sniper Tue Apr 19 18:06:46 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/openssl openssl.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/openssl/openssl.c?r1=1.52.2.22&r2=1.52.2.23&ty=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.52.2.22 php-src/ext/openssl/openssl.c:1.52.2.23
--- php-src/ext/openssl/openssl.c:1.52.2.22 Mon Mar 14 19:30:02 2005
+++ php-src/ext/openssl/openssl.c Tue Apr 19 18:06:42 2005
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.52.2.22 2005/03/15 00:30:02 iliaa Exp $ */
+/* $Id: openssl.c,v 1.52.2.23 2005/04/19 22:06:42 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -2510,7 +2510,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,
@@ -2566,7 +2566,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,
@@ -2629,7 +2629,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,
@@ -2686,7 +2686,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,