Module: sip-router Branch: master Commit: 8ebd2350ef97c6bac856850a3230ed3e245bd3ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ebd2350...
Author: Hugh Waite hugh.waite@crocodile-rcs.com Committer: Hugh Waite hugh.waite@crocodile-rcs.com Date: Fri Nov 8 20:30:08 2013 +0000
tls: TLSv1.1 supported since openssl v1.0.1
---
modules/tls/doc/params.xml | 2 +- modules/tls/tls_config.c | 2 +- modules/tls/tls_init.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index 5325f96..46de16f 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -28,7 +28,7 @@ <listitem> <para> <emphasis>TLSv1.1</emphasis> - only TLSv1.1 connections are accepted - (available starting with openssl/libssl v1.0.0) + (available starting with openssl/libssl v1.0.1) </para> </listitem> <listitem> diff --git a/modules/tls/tls_config.c b/modules/tls/tls_config.c index 4a78e9e..90a7c6c 100644 --- a/modules/tls/tls_config.c +++ b/modules/tls/tls_config.c @@ -460,7 +460,7 @@ int tls_parse_method(str* method) opt = cfg_lookup_token(methods, method); if (!opt) return -1;
-#if OPENSSL_VERSION_NUMBER < 0x01000000L +#if OPENSSL_VERSION_NUMBER < 0x1000100fL if(opt->val == TLS_USE_TLSv1_1) { LM_ERR("tls v1.1 not supported by this libssl version: %ld\n", (long)OPENSSL_VERSION_NUMBER); diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index 5118f15..9553b46 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -361,7 +361,7 @@ static void init_ssl_methods(void) ssl_methods[TLS_USE_SSLv23_srv - 1] = SSLv23_server_method(); ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
-#if OPENSSL_VERSION_NUMBER >= 0x01000000L +#if OPENSSL_VERSION_NUMBER >= 0x1000100fL ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
-
Hugh Waite