summaryrefslogtreecommitdiff
path: root/src/SocketCore.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2019-04-07 13:37:35 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2019-04-07 16:18:32 +0900
commit52da4e40ea22d1db13c1eadeac5baed4e8fd5dd8 (patch)
tree8091adba711093b9201845d9cd6b4ffdb9ea606b /src/SocketCore.cc
parent4af4a7cfc36936350bd2aa92a6e20384fc653a47 (diff)
Drop SSLv3.0 and TLSv1.0 and add TLSv1.3
TLSv1.3 support is added for GNUTLS and OpenSSL.
Diffstat (limited to 'src/SocketCore.cc')
-rw-r--r--src/SocketCore.cc26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/SocketCore.cc b/src/SocketCore.cc
index 77dc30cf..e235f512 100644
--- a/src/SocketCore.cc
+++ b/src/SocketCore.cc
@@ -971,23 +971,29 @@ bool SocketCore::tlsHandshake(TLSContext* tlsctx, const std::string& hostname)
if (!hostname.empty()) {
ss << ")";
}
- auto peerInfo = ss.str();
- // 2. Issue any warnings
+ std::string tlsVersion;
switch (ver) {
- case TLS_PROTO_NONE:
- A2_LOG_WARN(fmt(MSG_WARN_UNKNOWN_TLS_CONNECTION, peerInfo.c_str()));
+ case TLS_PROTO_TLS11:
+ tlsVersion = A2_V_TLS11;
break;
- case TLS_PROTO_SSL3:
- A2_LOG_WARN(
- fmt(MSG_WARN_OLD_TLS_CONNECTION, "SSLv3", peerInfo.c_str()));
+ case TLS_PROTO_TLS12:
+ tlsVersion = A2_V_TLS12;
break;
- default:
- A2_LOG_DEBUG(fmt("Securely connected to %s", peerInfo.c_str()));
+ case TLS_PROTO_TLS13:
+ tlsVersion = A2_V_TLS13;
break;
+ default:
+ assert(0);
+ abort();
}
- // 3. We're connected now!
+ auto peerInfo = ss.str();
+
+ A2_LOG_DEBUG(fmt("Securely connected to %s with %s", peerInfo.c_str(),
+ tlsVersion.c_str()));
+
+ // 2. We're connected now!
secure_ = A2_TLS_CONNECTED;
return true;
}