OpenBSD 6.7 errata 004 6.7/004_libssl.patch.siglibressl-v3.1.2

original commits:

CVSROOT:        /cvs
Module name:    src
Changes by:     jsing@cvs.openbsd.org   2020/05/16 08:44:55

Modified files:
        lib/libssl     : tls13_client.c

Log message:
Ensure that a TLSv1.3 server has provided a certificate.

The RFC requires that a server always provide a certificate for
authentication. Ensure that this is the case, rather than proceeding and
attempting validation. In the case where validation was disabled and the
server returned an empty certificate list, this would have previously
resulted in a NULL pointer deference.

Issue reported by otto@

ok inoguchi@ tb@

CVSROOT:        /cvs
Module name:    src
Changes by:     jsing@cvs.openbsd.org   2020/05/17 08:26:15

Modified files:
        lib/libssl     : tls13_client.c

Log message:
Send a decode error alert if a server provides an empty certificate list.

According to RFC 8446 section 4.4.2.4, a client receiving an empty
certificate list must abort the handshake with a decode error alert.

ok beck@ inoguchi@ tb@ ('it rarely is the alert you'd expect it to be...')

1 files changed, 4 insertions, 1 deletions

diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c
index 1e18a8258c..d25674d93b 100644
--- a/src/lib/libssl/tls13_legacy.c
+++ b/src/lib/libssl/tls13_legacy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: tls13_legacy.c,v 1.3 2020/04/28 20:37:22 jsing Exp $ */
+/*      $OpenBSD: tls13_legacy.c,v 1.3.4.1 2020/05/19 20:22:33 tb Exp $ */
 /*
  * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org>
  *
@@ -119,6 +119,9 @@ tls13_legacy_error(SSL *ssl)
         case TLS13_ERR_NO_SHARED_CIPHER:
                 reason = SSL_R_NO_SHARED_CIPHER;
                 break;
+        case TLS13_ERR_NO_PEER_CERTIFICATE:
+                reason = SSL_R_PEER_DID_NOT_RETURN_A_CERTIFICATE;
+                break;
         }
 
         /* Something (probably libcrypto) already pushed an error on the stack. */