diff -Nru php-5.1.6.org/ext/openssl/openssl.c php-5.1.6.mod/ext/openssl/openssl.c --- php-5.1.6.org/ext/openssl/openssl.c 2006-05-01 01:43:40.000000000 +0200 +++ php-5.1.6.mod/ext/openssl/openssl.c 2010-12-06 14:34:35.859652585 +0100 @@ -203,8 +203,13 @@ static char default_ssl_conf_filename[MAXPATHLEN]; struct php_x509_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, @@ -360,11 +365,19 @@ return ret; } +#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;