pajoye Mon Jul 6 23:02:19 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/openssl openssl.c
Log:
- #48116, fix build against openssl 1.0
http://cvs.php.net/viewvc.cgi/php-src/ext/openssl/openssl.c?r1=1.98.2.5.2.41.2.29&r2=1.98.2.5.2.41.2.30&diff_format=u
Index: php-src/ext/openssl/openssl.c
diff -u php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29
php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.30
--- php-src/ext/openssl/openssl.c:1.98.2.5.2.41.2.29 Mon Apr 20 09:44:29 2009
+++ php-src/ext/openssl/openssl.c Mon Jul 6 23:02:18 2009
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: openssl.c,v 1.98.2.5.2.41.2.29 2009/04/20 09:44:29 mkoppanen Exp $ */
+/* $Id: openssl.c,v 1.98.2.5.2.41.2.30 2009/07/06 23:02:18 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -502,8 +502,8 @@
static char default_ssl_conf_filename[MAXPATHLEN];
struct php_x509_request { /* {{{ */
- LHASH * global_config; /* Global SSL config */
- LHASH * req_config; /* SSL config for this request */
+ LHASH_OF(CONF_VALUE) * global_config; /* Global SSL config */
+ LHASH_OF(CONF_VALUE) * req_config; /* SSL config for this
request */
const EVP_MD * md_alg;
const EVP_MD * digest;
char * section_name,
@@ -680,7 +680,7 @@
}
/* }}} */
-static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH * config
TSRMLS_DC) /* {{{ */
+static inline int php_openssl_config_check_syntax(const char * section_label,
const char * config_filename, const char * section, LHASH_OF(CONF_VALUE) *
config TSRMLS_DC) /* {{{ */
{
X509V3_CTX ctx;
@@ -1158,7 +1158,7 @@
if (in == NULL) {
return NULL;
}
- cert = (X509 *) PEM_ASN1_read_bio((char *(*)())d2i_X509,
PEM_STRING_X509, in, NULL, NULL, NULL);
+ cert = (X509 *) PEM_ASN1_read_bio((d2i_of_void *)d2i_X509,
PEM_STRING_X509, in, NULL, NULL, NULL);
BIO_free(in);
}
@@ -2787,8 +2787,7 @@
case EVP_PKEY_RSA:
case EVP_PKEY_RSA2:
assert(pkey->pkey.rsa != NULL);
-
- if (NULL == pkey->pkey.rsa->p || NULL ==
pkey->pkey.rsa->q) {
+ if (pkey->pkey.rsa != NULL && (NULL ==
pkey->pkey.rsa->p || NULL == pkey->pkey.rsa->q)) {
return 0;
}
break;
Advertising
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
