X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fs_server.c;h=930ef6e4a863bf727bbdc701270b1fb0eb2c123d;hp=26947c31f394e7b6c8549c1d22af09f6f17c9751;hb=837f87c217fd595c814c4e1ab47ec1842d29b60d;hpb=6ea3bca427b3e759939a63555821d0c4678dd79c

diff --git a/apps/s_server.c b/apps/s_server.c
index 26947c31f3..930ef6e4a8 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1536,6 +1536,12 @@ int s_server_main(int argc, char *argv[])
     argc = opt_num_rest();
     argv = opt_rest();
 
+#ifndef OPENSSL_NO_NEXTPROTONEG
+    if (min_version == TLS1_3_VERSION && next_proto_neg_in != NULL) {
+        BIO_printf(bio_err, "Cannot supply -nextprotoneg with TLSv1.3\n");
+        goto opthelp;
+    }
+#endif
 #ifndef OPENSSL_NO_DTLS
     if (www && socket_type == SOCK_DGRAM) {
         BIO_printf(bio_err, "Can't use -HTTP, -www or -WWW with DTLS\n");