Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore -named_curve auto value to improve backwards compatibility #3518

Closed
wants to merge 1 commit into from

Conversation

t8m
Copy link
Member

@t8m t8m commented May 22, 2017

Fixes #3490

Checklist

Copy link
Contributor

@richsalz richsalz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great, thanks. minor nit noted. and also please add a comment to CHANGES.

ssl/ssl_conf.c Outdated
/* Ignore values supported by 1.0.2 for the automatic selection */
if ((cctx->flags & SSL_CONF_FLAG_FILE) && !strcasecmp(value, "+automatic"))
return 1;
else if ((cctx->flags & SSL_CONF_FLAG_CMDLINE) && !strcmp(value, "auto"))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no else after return :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops, sorry, and explicitly test against zero, don't use !

@t8m
Copy link
Member Author

t8m commented May 22, 2017

Updated patch

@kroeckx kroeckx added 1.1.0 branch: master Merge to master branch labels May 22, 2017
@mattcaswell
Copy link
Member

Ping @richsalz

@richsalz
Copy link
Contributor

richsalz commented Jun 8, 2017

fnx for the nudge.

levitte pushed a commit that referenced this pull request Jun 8, 2017
Fixes #3490

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #3518)
levitte pushed a commit that referenced this pull request Jun 8, 2017
Fixes #3490

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from #3518)
(cherry picked from commit 1c7aa0d)
@mattcaswell
Copy link
Member

Pushed. Thanks.

@mattcaswell mattcaswell closed this Jun 8, 2017
pracj3am pushed a commit to cdn77/openssl that referenced this pull request Aug 22, 2017
Fixes openssl#3490

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from openssl#3518)
(cherry picked from commit 1c7aa0d)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

auto option for -named_curve switch missing in man pages
4 participants