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

Fix else if #4562

Closed
wants to merge 3 commits into from
Closed

Fix else if #4562

wants to merge 3 commits into from

Conversation

KaoruToda
Copy link
Contributor

Expression is always false because 'else if' condition matches previous condition.
Since the next line of 'else if' condition has substituted TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2, I predict that 'else if' condition would like to compare with NID_X9_62_characteristic_two_field.

Expression is always false because 'else if' condition matches previous condition.
SInce the next line of 'else if' condition has substituted TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2, I predict that 'else if' condition  would like to compare with NID_X9_62_characteristic_two_field.
Since return type of ssl_cert_lookup_by_idx is pointer and unify coding
style, I changed from zero to NULL in ssl_cert.c.
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.

The change to t1_lib.c looks like it should to to 1.1.0 also, right?

@richsalz richsalz added 1.1.0 branch: master Merge to master branch approval: review pending This pull request needs review by a committer labels Oct 20, 2017
@dot-asm dot-asm added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Oct 20, 2017
levitte pushed a commit that referenced this pull request Oct 21, 2017
Add a check for NULL return in t1_lib.c.
    Since return type of ssl_cert_lookup_by_idx is pointer and unify coding
    style, I changed from zero to NULL in ssl_cert.c.

Remove unnecessary space for ++.

Fix incorrect condition
    Expression is always false because 'else if' condition matches previous
    condition.  SInce the next line of 'else if' condition has substituted
    TLSEXT_ECPOINTFORMAT_ansiX962_compressed_char2, the 'else if'
    condition should compare with NID_X9_62_characteristic_two_field.

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #4562)
@richsalz
Copy link
Contributor

pushed to master. curves were renamed to groups in master, so this doesn't pick cleanly to 1.1.0

thanks for the improvements!

@richsalz richsalz closed this Oct 21, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals branch: master Merge to master branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants