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 a crash or unbounded allocation in RSA_padding_add_PKCS1_PSS_mgf1 for 1.1.0 & 1.0.2 #2881
Closed
bernd-edlinger
wants to merge
2
commits into
openssl:OpenSSL_1_1_0-stable
from
bernd-edlinger:fix_crash_in_RSA_padding_add_PKCS1_PSS_mgf1_1
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
and RSA_verify_PKCS1_PSS_mgf1 with 512-bit RSA vs. sha-512.
bernd-edlinger
commented
Mar 8, 2017
crypto/rsa/rsa_pss.c
Outdated
if (sLen == -2) { | ||
sLen = emLen - hLen - 2; | ||
} else if (emLen < (hLen + sLen + 2)) { | ||
} else if (sLen > emLen -hLen - 2) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oops, white-space issue here, will fix it...
bernd-edlinger
force-pushed
the
fix_crash_in_RSA_padding_add_PKCS1_PSS_mgf1_1
branch
from
March 8, 2017 19:21
52d170b
to
b137060
Compare
dot-asm
approved these changes
Mar 13, 2017
richsalz
approved these changes
Mar 13, 2017
I was going to apply both... Should I proceed? |
yes, please do. |
levitte
pushed a commit
that referenced
this pull request
Mar 13, 2017
and RSA_verify_PKCS1_PSS_mgf1 with 512-bit RSA vs. sha-512. Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2881)
levitte
pushed a commit
that referenced
this pull request
Mar 13, 2017
Reviewed-by: Andy Polyakov <appro@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from #2881)
Applied to 1.1.0 and cherry-picked first commit to 1.0.2. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the back-port of #2801:
The first commit is usable for 1.1.0 & 1.0.2,
while the test case works only for 1.1.0