From: Todd Short <tshort@akamai.com>
Date: Fri, 2 Mar 2018 14:36:28 +0000 (-0500)
Subject: If not sending key_share (no TLSv1.3), return appropriately.
X-Git-Tag: OpenSSL_1_1_1-pre3~186
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa2ed504ea9d55be6e75a9647d874709dc71823b;p=oweals%2Fopenssl.git

If not sending key_share (no TLSv1.3), return appropriately.

This fixes an issue raised in PR #4964 by kaduk.

Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5491)
---

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index d569f3b84e..fa6c65b266 100644
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -705,9 +705,10 @@ EXT_RETURN tls_construct_ctos_key_share(SSL *s, WPACKET *pkt,
                  ERR_R_INTERNAL_ERROR);
         return EXT_RETURN_FAIL;
     }
-#endif
-
     return EXT_RETURN_SENT;
+#else
+    return EXT_RETURN_NOT_SENT;
+#endif
 }
 
 EXT_RETURN tls_construct_ctos_cookie(SSL *s, WPACKET *pkt, unsigned int context,