aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2014-03-10 17:11:25 +0100
committerDaniel Stenberg <daniel@haxx.se>2014-03-10 17:13:11 +0100
commitdcdbac2568187a08be2728b0b2df27843b437797 (patch)
tree6570d3be6ca7396f1f45d2882c59d840e71543f2 /lib
parentac7118319e995327819b0f0141c4fff77faa2600 (diff)
openssl: info massage with SSL version used
Patch-by: byte_bucket
Diffstat (limited to 'lib')
-rw-r--r--lib/vtls/openssl.c27
1 files changed, 26 insertions, 1 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index c8862ef7a..0014e588c 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -1445,6 +1445,30 @@ select_next_proto_cb(SSL *ssl,
}
#endif
+static const char *
+get_ssl_version_txt(SSL_SESSION *session)
+{
+ if(NULL == session)
+ return "";
+
+ switch(session->ssl_version) {
+#if OPENSSL_VERSION_NUMBER >= 0x1000100FL
+ case TLS1_2_VERSION:
+ return "TLSv1.2";
+ case TLS1_1_VERSION:
+ return "TLSv1.1";
+#endif
+ case TLS1_VERSION:
+ return "TLSv1.0";
+ case SSL3_VERSION:
+ return "SSLv3";
+ case SSL2_VERSION:
+ return "SSLv2";
+ }
+ return "unknown";
+}
+
+
static CURLcode
ossl_connect_step1(struct connectdata *conn,
int sockindex)
@@ -1964,7 +1988,8 @@ ossl_connect_step2(struct connectdata *conn, int sockindex)
connssl->connecting_state = ssl_connect_3;
/* Informational message */
- infof (data, "SSL connection using %s\n",
+ infof (data, "SSL connection using %s / %s\n",
+ get_ssl_version_txt(SSL_get_session(connssl->handle)),
SSL_get_cipher(connssl->handle));
#ifdef HAS_ALPN