AppleTLS: TLSv3

This commit is contained in:
Nils Maier 2019-10-06 09:20:11 +02:00
parent 6b36224453
commit a6671aec37

View File

@ -53,8 +53,9 @@
namespace { namespace {
#if !defined(__MAC_10_8) #if !defined(__MAC_10_8)
static const SSLProtocol kTLSProtocol11 = (SSLProtocol)(kSSLProtocolAll + 1); static const SSLProtocol kTLSProtocol11 = 7;
static const SSLProtocol kTLSProtocol12 = (SSLProtocol)(kSSLProtocolAll + 2); static const SSLProtocol kTLSProtocol12 = 8;
static const SSLProtocol kTLSProtocol13 = 13;
#endif #endif
#ifndef CIPHER_NO_DHPARAM #ifndef CIPHER_NO_DHPARAM
@ -92,6 +93,8 @@ static inline const char* protoToString(SSLProtocol proto)
return "TLSv1.1"; return "TLSv1.1";
case kTLSProtocol12: case kTLSProtocol12:
return "TLSv1.2"; return "TLSv1.2";
case kTLSProtocol13:
return "TLSv1.3";
default: default:
return "Unknown"; return "Unknown";
} }
@ -382,6 +385,9 @@ AppleTLSSession::AppleTLSSession(AppleTLSContext* ctx)
case TLS_PROTO_TLS12: case TLS_PROTO_TLS12:
(void)SSLSetProtocolVersionMin(sslCtx_, kTLSProtocol12); (void)SSLSetProtocolVersionMin(sslCtx_, kTLSProtocol12);
break; break;
case TLS_PROTO_TLS13:
(void)SSLSetProtocolVersionMin(sslCtx_, kTLSProtocol13);
break;
default: default:
break; break;
} }
@ -393,6 +399,9 @@ AppleTLSSession::AppleTLSSession(AppleTLSContext* ctx)
// fall through // fall through
case TLS_PROTO_TLS12: case TLS_PROTO_TLS12:
(void)SSLSetProtocolVersionEnabled(sslCtx_, kTLSProtocol12, true); (void)SSLSetProtocolVersionEnabled(sslCtx_, kTLSProtocol12, true);
// fall through
case TLS_PROTO_TLS13:
(void)SSLSetProtocolVersionEnabled(sslCtx_, kTLSProtocol13, true);
default: default:
break; break;
} }
@ -742,6 +751,9 @@ int AppleTLSSession::tlsConnect(const std::string& hostname,
case kTLSProtocol12: case kTLSProtocol12:
version = TLS_PROTO_TLS12; version = TLS_PROTO_TLS12;
break; break;
case kTLSProtocol13:
version = TLS_PROTO_TLS13;
break;
default: default:
version = TLS_PROTO_NONE; version = TLS_PROTO_NONE;
break; break;