The branch master has been updated
via aa2ed504ea9d55be6e75a9647d874709dc71823b (commit)
from 5de683d2c6ae2f8c30b97326e72ff19f41228b74 (commit)
- Log -----------------------------------------------------------------
commit aa2ed504ea9d55be6e75a9647d874709dc71823b
Author: Todd Short <[email protected]>
Date: Fri Mar 2 09:36:28 2018 -0500
If not sending key_share (no TLSv1.3), return appropriately.
This fixes an issue raised in PR #4964 by kaduk.
Reviewed-by: Ben Kaduk <[email protected]>
Reviewed-by: Matt Caswell <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/5491)
-----------------------------------------------------------------------
Summary of changes:
ssl/statem/extensions_clnt.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index d569f3b..fa6c65b 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,
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
