提交 1c7aa0db 编写于 作者: T Tomas Mraz 提交者: Matt Caswell

Ignore -named_curve auto value to improve backwards compatibility

Fixes #3490
Reviewed-by: NRich Salz <rsalz@openssl.org>
Reviewed-by: NMatt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3518)
上级 0b20ad12
...@@ -14,6 +14,10 @@ ...@@ -14,6 +14,10 @@
than just the call where this user data is passed. than just the call where this user data is passed.
[Richard Levitte] [Richard Levitte]
*) Ignore the '-named_curve auto' value for compatibility of applications
with OpenSSL 1.0.2.
[Tomas Mraz <tmraz@fedoraproject.org>]
*) Fragmented SSL/TLS alerts are no longer accepted. An alert message is 2 *) Fragmented SSL/TLS alerts are no longer accepted. An alert message is 2
bytes long. In theory it is permissible in SSLv3 - TLSv1.2 to fragment such bytes long. In theory it is permissible in SSLv3 - TLSv1.2 to fragment such
alerts across multiple records (some of which could be empty). In practice alerts across multiple records (some of which could be empty). In practice
......
...@@ -227,6 +227,14 @@ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value) ...@@ -227,6 +227,14 @@ static int cmd_ECDHParameters(SSL_CONF_CTX *cctx, const char *value)
EC_KEY *ecdh; EC_KEY *ecdh;
int nid; int nid;
/* Ignore values supported by 1.0.2 for the automatic selection */
if ((cctx->flags & SSL_CONF_FLAG_FILE) &&
strcasecmp(value, "+automatic") == 0)
return 1;
if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) &&
strcmp(value, "auto") == 0)
return 1;
nid = EC_curve_nist2nid(value); nid = EC_curve_nist2nid(value);
if (nid == NID_undef) if (nid == NID_undef)
nid = OBJ_sn2nid(value); nid = OBJ_sn2nid(value);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册