From: Tomas Mraz <tmraz@fedoraproject.org>
Date: Thu, 26 Mar 2020 14:59:00 +0000 (+0100)
Subject: s_server: Properly indicate ALPN protocol mismatch
X-Git-Tag: openssl-3.0.0-alpha1~195
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9e885a707d604e9528b5491b78fb9c00f41193fc;p=oweals%2Fopenssl.git

s_server: Properly indicate ALPN protocol mismatch

Return SSL_TLSEXT_ERR_ALERT_FATAL from alpn_select_cb so that
an alert is sent to the client on ALPN protocol mismatch.

Fixes: #2708

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11415)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index bcc83e562c..591c6c19c5 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -707,7 +707,7 @@ static int alpn_cb(SSL *s, const unsigned char **out, unsigned char *outlen,
     if (SSL_select_next_proto
         ((unsigned char **)out, outlen, alpn_ctx->data, alpn_ctx->len, in,
          inlen) != OPENSSL_NPN_NEGOTIATED) {
-        return SSL_TLSEXT_ERR_NOACK;
+        return SSL_TLSEXT_ERR_ALERT_FATAL;
     }
 
     if (!s_quiet) {