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 a crash or unbounded allocation in RSA_padding_add_PKCS1_PSS_mgf1 for 1.1.0 & 1.0.2 #2881

Conversation

bernd-edlinger
Copy link
Member

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

if (sLen == -2) {
sLen = emLen - hLen - 2;
} else if (emLen < (hLen + sLen + 2)) {
} else if (sLen > emLen -hLen - 2) {
Copy link
Member Author

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 bernd-edlinger force-pushed the fix_crash_in_RSA_padding_add_PKCS1_PSS_mgf1_1 branch from 52d170b to b137060 Compare March 8, 2017 19:21
@dot-asm dot-asm added branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch 1.1.0 labels Mar 13, 2017
@richsalz richsalz self-assigned this Mar 13, 2017
@dot-asm
Copy link
Contributor

dot-asm commented Mar 13, 2017

I was going to apply both... Should I proceed?

@richsalz
Copy link
Contributor

yes, please do.

@richsalz richsalz assigned dot-asm and unassigned richsalz Mar 13, 2017
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)
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)

(cherry picked from commit e653b6c)
@dot-asm
Copy link
Contributor

dot-asm commented Mar 13, 2017

Applied to 1.1.0 and cherry-picked first commit to 1.0.2. Thanks!

@dot-asm dot-asm closed this Mar 13, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
branch: 1.0.2 Merge to OpenSSL_1_0_2-stable branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants