summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Sing <jsing@cvs.openbsd.org>2020-01-25 15:06:18 +0000
committerJoel Sing <jsing@cvs.openbsd.org>2020-01-25 15:06:18 +0000
commita14350290292259d997ceff7dfdca4ab7046ff8f (patch)
tree3401ed2027036db4a769a08b521bcb8a81367268
parent800ed8df42f692d55a629b2d5a21a3c3779943fa (diff)
Revert change to certificate request check from r1.45.
This code was correct, it was the entry in the table that was incorrect. ok beck@
-rw-r--r--lib/libssl/tls13_handshake.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/tls13_handshake.c b/lib/libssl/tls13_handshake.c
index 7d150930d9d..d194688f710 100644
--- a/lib/libssl/tls13_handshake.c
+++ b/lib/libssl/tls13_handshake.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tls13_handshake.c,v 1.47 2020/01/25 13:21:52 beck Exp $ */
+/* $OpenBSD: tls13_handshake.c,v 1.48 2020/01/25 15:06:17 jsing Exp $ */
/*
* Copyright (c) 2018-2019 Theo Buehler <tb@openbsd.org>
* Copyright (c) 2019 Joel Sing <jsing@openbsd.org>
@@ -413,8 +413,8 @@ tls13_handshake_recv_action(struct tls13_ctx *ctx,
*/
msg_type = tls13_handshake_msg_type(ctx->hs_msg);
if (msg_type != action->handshake_type &&
- (msg_type != TLS13_MT_CERTIFICATE_REQUEST ||
- action->handshake_type != TLS13_MT_CERTIFICATE))
+ (msg_type != TLS13_MT_CERTIFICATE ||
+ action->handshake_type != TLS13_MT_CERTIFICATE_REQUEST))
return tls13_send_alert(ctx->rl, SSL_AD_UNEXPECTED_MESSAGE);
if (!tls13_handshake_msg_content(ctx->hs_msg, &cbs))