diff options
author | tb <> | 2021-12-16 06:32:56 +0000 |
---|---|---|
committer | tb <> | 2021-12-16 06:32:56 +0000 |
commit | 4f80dfe9175818c95601080a13eaa12f62cbe806 (patch) | |
tree | af49592749b971b1359eb2bf2f7a3c0d6d1a3385 /src | |
parent | 93f72c22f0cebe4b6a760100c045c6f1eeb9f893 (diff) | |
download | openbsd-4f80dfe9175818c95601080a13eaa12f62cbe806.tar.gz openbsd-4f80dfe9175818c95601080a13eaa12f62cbe806.tar.bz2 openbsd-4f80dfe9175818c95601080a13eaa12f62cbe806.zip |
unifdef TLS13_USE_LEGACY_CLIENT_AUTH
Before the TLSv1.3 stack grew client certificate support, it fell back
to the legacy stack. Proper client certificate support was added in a2k20
with a TLS13_USE_LEGACY_CLIENT_AUTH knob to provide an easy fallback in
case the new code should have a problem. This was never needed.
As ifdefed code is wont to do, this bitrotted a few months later when
the client and server methods were merged.
discussed with jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libssl/tls13_legacy.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c index 18e6fa3681..e54db03e3c 100644 --- a/src/lib/libssl/tls13_legacy.c +++ b/src/lib/libssl/tls13_legacy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_legacy.c,v 1.32 2021/10/23 14:40:54 jsing Exp $ */ | 1 | /* $OpenBSD: tls13_legacy.c,v 1.33 2021/12/16 06:32:56 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -445,14 +445,6 @@ tls13_legacy_connect(SSL *ssl) | |||
445 | struct tls13_ctx *ctx = ssl->internal->tls13; | 445 | struct tls13_ctx *ctx = ssl->internal->tls13; |
446 | int ret; | 446 | int ret; |
447 | 447 | ||
448 | #ifdef TLS13_USE_LEGACY_CLIENT_AUTH | ||
449 | /* XXX drop back to legacy for client auth for now */ | ||
450 | if (ssl->cert->key->privatekey != NULL) { | ||
451 | ssl->method = tls_legacy_client_method(); | ||
452 | return ssl->method->ssl_connect(ssl); | ||
453 | } | ||
454 | #endif | ||
455 | |||
456 | if (ctx == NULL) { | 448 | if (ctx == NULL) { |
457 | if ((ctx = tls13_ctx_new(TLS13_HS_CLIENT)) == NULL) { | 449 | if ((ctx = tls13_ctx_new(TLS13_HS_CLIENT)) == NULL) { |
458 | SSLerror(ssl, ERR_R_INTERNAL_ERROR); /* XXX */ | 450 | SSLerror(ssl, ERR_R_INTERNAL_ERROR); /* XXX */ |