blob: 20761b00d600c1cc40ee8321d18aa65ba76283a4 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
$NetBSD: patch-ax,v 1.1 2009/08/11 14:41:23 taca Exp $
--- ext/openssl/openssl.c.orig 2009-04-20 19:00:41.000000000 +0900
+++ ext/openssl/openssl.c
@@ -227,8 +227,13 @@ inline static int php_openssl_safe_mode_
static char default_ssl_conf_filename[MAXPATHLEN];
struct php_x509_request { /* {{{ */
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ 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,
@@ -410,7 +415,11 @@ static inline int php_openssl_config_che
const char * section_label,
const char * config_filename,
const char * section,
+#if OPENSSL_VERSION_NUMBER >= 0x10000000L
+ LHASH_OF(CONF_VALUE) * config TSRMLS_DC
+#else
LHASH * config TSRMLS_DC
+#endif
) /* {{{ */
{
X509V3_CTX ctx;
|