summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2019-11-17 00:16:58 +0000
committerbeck <>2019-11-17 00:16:58 +0000
commitb640c5f7f1ee7bfdfee44d5c84459dfb76f880d9 (patch)
tree0ce473b581789f4c326fe64f91eb9bade13c3984
parent6dc247f99372dd30c77652836201381b14efe0af (diff)
downloadopenbsd-b640c5f7f1ee7bfdfee44d5c84459dfb76f880d9.tar.gz
openbsd-b640c5f7f1ee7bfdfee44d5c84459dfb76f880d9.tar.bz2
openbsd-b640c5f7f1ee7bfdfee44d5c84459dfb76f880d9.zip
Drop back to the legacy tls method if we are doing client authenticaiton
from a tls 1.3 connection, for now. ok jsing@
-rw-r--r--src/lib/libssl/tls13_client.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/lib/libssl/tls13_client.c b/src/lib/libssl/tls13_client.c
index a9f1b6bbd5..e092e7f811 100644
--- a/src/lib/libssl/tls13_client.c
+++ b/src/lib/libssl/tls13_client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: tls13_client.c,v 1.16 2019/04/05 20:23:38 tb Exp $ */ 1/* $OpenBSD: tls13_client.c,v 1.17 2019/11/17 00:16:58 beck 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 *
@@ -63,6 +63,12 @@ tls13_legacy_connect(SSL *ssl)
63 struct tls13_ctx *ctx = ssl->internal->tls13; 63 struct tls13_ctx *ctx = ssl->internal->tls13;
64 int ret; 64 int ret;
65 65
66 /* XXX drop back to legacy for client auth for now */
67 if (ssl->cert->key != NULL) {
68 ssl->method = tls_legacy_client_method();
69 return ssl->method->internal->ssl_connect(ssl);
70 }
71
66 if (ctx == NULL) { 72 if (ctx == NULL) {
67 if ((ctx = tls13_ctx_new(TLS13_HS_CLIENT)) == NULL) { 73 if ((ctx = tls13_ctx_new(TLS13_HS_CLIENT)) == NULL) {
68 SSLerror(ssl, ERR_R_INTERNAL_ERROR); /* XXX */ 74 SSLerror(ssl, ERR_R_INTERNAL_ERROR); /* XXX */