diff options
| author | Gergely Nagy <ngg@tresorit.com> | 2013-09-19 15:17:13 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-10-15 20:26:47 +0200 |
| commit | ad34a2d5c87c7f4b14e8dded34569395de0d8c5b (patch) | |
| tree | a04f58cee7781e3b0fcf4d5701ccc53f547f8d38 /src | |
| parent | 31e106c01c594190432c386e3d1de87af6c4f242 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/tool_getparam.c | 25 | ||||
| -rw-r--r-- | src/tool_setopt.c | 3 |
2 files changed, 25 insertions, 3 deletions
diff --git a/src/tool_getparam.c b/src/tool_getparam.c index 6a405ff41..d0feb71ed 100644 --- a/src/tool_getparam.c +++ b/src/tool_getparam.c @@ -184,6 +184,9 @@ static const struct LongShort aliases[]= { {"01", "http1.1", FALSE}, {"02", "http2.0", FALSE}, {"1", "tlsv1", FALSE}, + {"10", "tlsv1.0", FALSE}, + {"11", "tlsv1.1", FALSE}, + {"12", "tlsv1.2", FALSE}, {"2", "sslv2", FALSE}, {"3", "sslv3", FALSE}, {"4", "ipv4", FALSE}, @@ -1023,9 +1026,25 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ break; } break; - case '1': - /* TLS version 1 */ - config->ssl_version = CURL_SSLVERSION_TLSv1; + case '1': /* --tlsv1* options */ + switch(subletter) { + case '\0': + /* TLS version 1.x */ + config->ssl_version = CURL_SSLVERSION_TLSv1; + break; + case '0': + /* TLS version 1.0 */ + config->ssl_version = CURL_SSLVERSION_TLSv1_0; + break; + case '1': + /* TLS version 1.1 */ + config->ssl_version = CURL_SSLVERSION_TLSv1_1; + break; + case '2': + /* TLS version 1.2 */ + config->ssl_version = CURL_SSLVERSION_TLSv1_2; + break; + } break; case '2': /* SSL version 2 */ diff --git a/src/tool_setopt.c b/src/tool_setopt.c index cb93e1117..f29bcd619 100644 --- a/src/tool_setopt.c +++ b/src/tool_setopt.c @@ -78,6 +78,9 @@ const NameValue setopt_nv_CURL_SSLVERSION[] = { NV(CURL_SSLVERSION_TLSv1), NV(CURL_SSLVERSION_SSLv2), NV(CURL_SSLVERSION_SSLv3), + NV(CURL_SSLVERSION_TLSv1_0), + NV(CURL_SSLVERSION_TLSv1_1), + NV(CURL_SSLVERSION_TLSv1_2), NVEND, }; |