From: Jouni Malinen Date: Sun, 27 Nov 2011 19:58:27 +0000 (+0200) Subject: TLS: Allow TLS v1.2 to be negotiated X-Git-Tag: aosp-jb-start~248 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b919be289b6bf44978194d7cb49f4032b9e974e;p=thirdparty%2Fhostap.git TLS: Allow TLS v1.2 to be negotiated Signed-hostap: Jouni Malinen --- diff --git a/src/tls/tlsv1_server_read.c b/src/tls/tlsv1_server_read.c index 11116f10c..443c028fb 100644 --- a/src/tls/tlsv1_server_read.c +++ b/src/tls/tlsv1_server_read.c @@ -99,6 +99,10 @@ static int tls_process_client_hello(struct tlsv1_server *conn, u8 ct, if (TLS_VERSION == TLS_VERSION_1) conn->rl.tls_version = TLS_VERSION_1; +#ifdef CONFIG_TLSV12 + else if (conn->client_version >= TLS_VERSION_1_2) + conn->rl.tls_version = TLS_VERSION_1_2; +#endif /* CONFIG_TLSV12 */ else if (conn->client_version > TLS_VERSION_1_1) conn->rl.tls_version = TLS_VERSION_1_1; else