From ad34a2d5c87c7f4b14e8dded34569395de0d8c5b Mon Sep 17 00:00:00 2001 From: Gergely Nagy Date: Thu, 19 Sep 2013 15:17:13 +0200 Subject: SSL: protocol version can be specified more precisely CURL_SSLVERSION_TLSv1_0, CURL_SSLVERSION_TLSv1_1, CURL_SSLVERSION_TLSv1_2 enum values are added to force exact TLS version (CURL_SSLVERSION_TLSv1 means TLS 1.x). axTLS: axTLS only supports TLS 1.0 and 1.1 but it cannot be set that only one of these should be used, so we don't allow the new enum values. darwinssl: Added support for the new enum values. SChannel: Added support for the new enum values. CyaSSL: Added support for the new enum values. Bug: The original CURL_SSLVERSION_TLSv1 value enables only TLS 1.0 (it did the same before this commit), because CyaSSL cannot be configured to use TLS 1.0-1.2. GSKit: GSKit doesn't seem to support TLS 1.1 and TLS 1.2, so we do not allow those values. Bugfix: There was a typo that caused wrong SSL versions to be passed to GSKit. NSS: TLS minor version cannot be set, so we don't allow the new enum values. QsoSSL: TLS minor version cannot be set, so we don't allow the new enum values. OpenSSL: Added support for the new enum values. Bugfix: The original CURL_SSLVERSION_TLSv1 value enabled only TLS 1.0, now it enables 1.0-1.2. Command-line tool: Added command line options for the new values. --- lib/axtls.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/axtls.c') diff --git a/lib/axtls.c b/lib/axtls.c index 44e6b9303..8c92588f7 100644 --- a/lib/axtls.c +++ b/lib/axtls.c @@ -164,7 +164,8 @@ static CURLcode connect_prep(struct connectdata *conn, int sockindex) case CURL_SSLVERSION_TLSv1: break; default: - failf(data, "axTLS only supports TLSv1"); + failf(data, "axTLS only supports TLS 1.0 and 1.1, " + "and it cannot be specified which one to use"); return CURLE_SSL_CONNECT_ERROR; } -- cgit v1.2.3