- #48116, fix build with openssl 1.0

diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c
index 848ef7534ea31e89c210bf4eea74c21d1933f96c..4d1e9dafb462d6840a210f4823acfaf04e323996 100644 (file)
--- a/ext/openssl/openssl.c
+++ b/ext/openssl/openssl.c
@@ -484,8 +484,13 @@ static void php_csr_free(zend_rsrc_list_entry *rsrc TSRMLS_DC)
 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 */
+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
+       LHASH_OF(CONF_VALUE) * global_config;   /* Global SSL config */
+       LHASH_OF(CONF_VALUE) * req_config;              /* SSL config for this request */
+#else
+       LHASH * global_config;  /* Global SSL config */
+       LHASH * req_config;             /* SSL config for this request */
+#endif
        const EVP_MD * md_alg;
        const EVP_MD * digest;
        char    * section_name,
@@ -674,7 +679,11 @@ static time_t asn1_time_to_time_t(ASN1_UTCTIME * timestr TSRMLS_DC) /* {{{ */
 }
 /* }}} */
 
+#if OPENSSL_VERSION_NUMBER >= 0x10000002L
+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) /* {{{ */
+#else
 static inline int php_openssl_config_check_syntax(const char * section_label, const char * config_filename, const char * section, LHASH * config TSRMLS_DC) /* {{{ */
+#endif
 {
        X509V3_CTX ctx;
        
@@ -1177,8 +1186,7 @@ static X509 * php_openssl_x509_from_zval(zval ** val, int makeresource, long * r
                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);
        }
        if (cert && makeresource && resourceval) {
@@ -2931,8 +2939,7 @@ static int php_openssl_is_private_key(EVP_PKEY* pkey TSRMLS_DC)
                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;