aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-12-05 15:14:04 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-12-05 15:14:04 +0000
commit083c5e17e176058190d228ee9c25987898014417 (patch)
treed165f74083bffd9182d0ffeba8a6a76117e0f351 /lib
parent272231fb09052e97a218d9ea00db57692d59c1de (diff)
Yang Tse fixed: Openssl 0.9.9 makes 'const' the SSL_METHOD parameter in
SSL_CTX_new and others, and also makes functions SSLv23_client_method, TLSv1_client_method, etc return a 'const' SSL_METHOD pointer. Previous versions do not use the 'const' qualifier.
Diffstat (limited to 'lib')
-rw-r--r--lib/ssluse.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 550e0ee95..162f400d6 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -104,11 +104,16 @@
#undef HAVE_PKCS12_SUPPORT
#endif
-
#if OPENSSL_VERSION_NUMBER >= 0x00906001L
#define HAVE_ERR_ERROR_STRING_N 1
#endif
+#if OPENSSL_VERSION_NUMBER >= 0x00909000L
+#define SSL_METHOD_QUAL const
+#else
+#define SSL_METHOD_QUAL
+#endif
+
/*
* Number of bytes to read from the random number seed file. This must be
* a finite value (because some entropy "files" like /dev/urandom have
@@ -1121,7 +1126,7 @@ Curl_ossl_connect(struct connectdata *conn,
long lerr;
int what;
char * str;
- const SSL_METHOD *req_method;
+ SSL_METHOD_QUAL SSL_METHOD *req_method=NULL;
void *ssl_sessionid=NULL;
ASN1_TIME *certdate;
curl_socket_t sockfd = conn->sock[sockindex];