aboutsummaryrefslogtreecommitdiff
path: root/lib/vtls
diff options
context:
space:
mode:
authorJay Satiro <raysatiro@yahoo.com>2015-03-28 00:16:08 -0400
committerDaniel Stenberg <daniel@haxx.se>2015-03-28 16:41:51 +0100
commitfcdc597b1a78fcc2940a3725366af5559d4d2647 (patch)
tree87a2550f233f0da0e83b67ab0729b07d01cb27cb /lib/vtls
parent623d24f3eefed95e397b822e7370ccb3c1b30914 (diff)
cyassl: CTX callback cosmetic changes and doc fix
- More descriptive fail message for NO_FILESYSTEM builds. - Cosmetic changes. - Change more of CURLOPT_SSL_CTX_* doc to not be OpenSSL specific.
Diffstat (limited to 'lib/vtls')
-rw-r--r--lib/vtls/cyassl.c10
-rw-r--r--lib/vtls/cyassl.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c
index 7a10eba12..a8c1ba5f3 100644
--- a/lib/vtls/cyassl.c
+++ b/lib/vtls/cyassl.c
@@ -191,7 +191,7 @@ cyassl_connect_step1(struct connectdata *conn,
return CURLE_SSL_CONNECT_ERROR;
}
}
-#endif /* NO_FILESYSTEM */
+#endif /* !NO_FILESYSTEM */
/* SSL always tries to verify the peer, this only says whether it should
* fail to connect if the verification fails, or if it should continue
@@ -205,7 +205,7 @@ cyassl_connect_step1(struct connectdata *conn,
if(data->set.ssl.fsslctx) {
CURLcode result = CURLE_OK;
result = (*data->set.ssl.fsslctx)(data, conssl->ctx,
- data->set.ssl.fsslctxp);
+ data->set.ssl.fsslctxp);
if(result) {
failf(data, "error signaled by ssl ctx callback");
return result;
@@ -213,8 +213,10 @@ cyassl_connect_step1(struct connectdata *conn,
}
#ifdef NO_FILESYSTEM
else if(data->set.ssl.verifypeer) {
- failf(data, "CyaSSL: unable to verify certificate; no certificate",
- " authorities registered");
+ failf(data, "SSL: Certificates couldn't be loaded because CyaSSL was built"
+ " with \"no filesystem\". Either disable peer verification"
+ " (insecure) or if you are building an application with libcurl you"
+ " can load certificates via CURLOPT_SSL_CTX_FUNCTION.");
return CURLE_SSL_CONNECT_ERROR;
}
#endif
diff --git a/lib/vtls/cyassl.h b/lib/vtls/cyassl.h
index ba64ab2ca..12638a76d 100644
--- a/lib/vtls/cyassl.h
+++ b/lib/vtls/cyassl.h
@@ -46,7 +46,7 @@ int Curl_cyassl_random(struct SessionHandle *data,
/* Set the API backend definition to Schannel */
#define CURL_SSL_BACKEND CURLSSLBACKEND_CYASSL
-/* this backend suppots CURLOPT_SSL_CTX_FUNCTION */
+/* this backend supports CURLOPT_SSL_CTX_* */
#define have_curlssl_ssl_ctx 1
/* API setup for CyaSSL */