X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=apps%2Fs_client.c;h=ad0eaec5622a0f27877040104d082cf3ac4325dd;hp=8af3853e4bd2cf9abe183be0778a12bcd167245f;hb=837f87c217fd595c814c4e1ab47ec1842d29b60d;hpb=6ea3bca427b3e759939a63555821d0c4678dd79c

diff --git a/apps/s_client.c b/apps/s_client.c
index 8af3853e4b..ad0eaec562 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -1424,6 +1424,12 @@ int s_client_main(int argc, char **argv)
     if (argc != 0)
         goto opthelp;
 
+#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
     if (proxystr != NULL) {
         int res;
         char *tmp_host = host, *tmp_port = port;