aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Sylvester <peter.sylvester@edelweb.fr>2012-01-04 23:02:36 +0100
committerDaniel Stenberg <daniel@haxx.se>2012-01-04 23:02:36 +0100
commit81524cbfa02f8882040ecf2947dcf5c8523591ca (patch)
treedaecd32969c5d773b39b67c4412499963011b747
parent8ef7a5706e4abaf841ee8577311ab0fde8a2ab37 (diff)
OpenSSL: remove reference to openssl internal struct
With this change, curl compiles with the new OPENSSL_NO_SSL_INTERN cflag. This flag might become the default in some distant future.
-rw-r--r--docs/examples/curlx.c3
-rw-r--r--lib/ssluse.c7
2 files changed, 5 insertions, 5 deletions
diff --git a/docs/examples/curlx.c b/docs/examples/curlx.c
index 62bdfe405..89d5f407b 100644
--- a/docs/examples/curlx.c
+++ b/docs/examples/curlx.c
@@ -239,8 +239,7 @@ static CURLcode sslctxfun(CURL * curl, void * sslctx, void * parm) {
SSL_CTX_set_cipher_list(ctx,"RC4-MD5");
SSL_CTX_set_mode(ctx, SSL_MODE_AUTO_RETRY);
- X509_STORE_add_cert(ctx->cert_store,sk_X509_value(p->ca,
- sk_X509_num(p->ca)-1));
+ X509_STORE_add_cert(SSL_CTX_get_cert_store(ctx), sk_X509_value(p->ca, sk_X509_num(p->ca)-1));
SSL_CTX_set_verify_depth(ctx,2);
diff --git a/lib/ssluse.c b/lib/ssluse.c
index 8deea26ae..975ab8cf6 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -1636,7 +1636,8 @@ ossl_connect_step1(struct connectdata *conn,
if(data->set.str[STRING_SSL_CRLFILE]) {
/* tell SSL where to find CRL file that is used to check certificate
* revocation */
- lookup=X509_STORE_add_lookup(connssl->ctx->cert_store,X509_LOOKUP_file());
+ lookup=X509_STORE_add_lookup(SSL_CTX_get_cert_store(connssl->ctx),
+ X509_LOOKUP_file());
if(!lookup ||
(!X509_load_crl_file(lookup,data->set.str[STRING_SSL_CRLFILE],
X509_FILETYPE_PEM)) ) {
@@ -1647,7 +1648,7 @@ ossl_connect_step1(struct connectdata *conn,
else {
/* Everything is fine. */
infof(data, "successfully load CRL file:\n");
- X509_STORE_set_flags(connssl->ctx->cert_store,
+ X509_STORE_set_flags(SSL_CTX_get_cert_store(connssl->ctx),
X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL);
}
infof(data,