[1.1.0 backport] Remove DSA digest length checks when no digest is passed #6750
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
bdonlan
force-pushed
the
dsa_len_bp
branch
2 times, most recently
from
0e78229
to
4b61daa
Compare
1 task
bdonlan
force-pushed
the
dsa_len_bp
branch
3 times, most recently
from
57bd84c
to
5284ecd
Compare
richsalz
suggested changes
Jul 20, 2018
test/dsa_no_digest_size_test.c
Outdated
| static int genkeys(void) | ||
| { | ||
| dsa = DSA_new(); | ||
| if (!dsa) { |
There was a problem hiding this comment.
Please use NULL not ! for pointer tests; there are multiple places to change.
test/dsa_no_digest_size_test.c
Outdated
| dataToSign = OPENSSL_malloc(len); | ||
| paddedData = OPENSSL_malloc(digestlen); | ||
|
|
||
| if (!dataToSign || !paddedData) goto end; |
There was a problem hiding this comment.
put the goto on a separate line. there's a couple of other places where statements are joined, that we want on separate lines.
FIPS 186-4 does not specify a hard requirement on DSA digest lengths, and in any case the current check rejects the FIPS recommended digest lengths for key sizes != 1024 bits. Backport for: openssl#6748
bdonlan
force-pushed
the
dsa_len_bp
branch
3 times, most recently
from
1f131ed
to
e14321c
Compare
richsalz
reviewed
Jul 23, 2018
test/dsa_no_digest_size_test.c
Outdated
|
|
||
| ok = 1; | ||
| end: | ||
| if (!ok) ERR_print_errors_fp(stderr); |
There was a problem hiding this comment.
please put this on two lines.
richsalz
suggested changes
Jul 24, 2018
test/dsa_no_digest_size_test.c
Outdated
| fprintf(stderr, "Key generation failed\n"); | ||
| return 1; | ||
| } | ||
| if (!dsa_exact_size_test()) return 1; |
There was a problem hiding this comment.
please put these all on two lines each.
|
As andy says, #6749 had the first commit cherry-picked, so let's close this. Thanks for doing the test, anyway! |
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 change fixes #6748 on the 1.1.0 stable branch, and introduces a test to prevent future regressions. See the bug for more details.
As this bug was a regression in 1.1.0, a 1.0.x backport is not required.
Checklist