diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-02-10 18:44:00 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-02-18 11:02:26 +0100 |
| commit | ba37b82045b1b2fbcbf7580b317de5e3b52c8035 (patch) | |
| tree | 96e779b80c7c34adf8913f02bcc557cff6661042 /test | |
| parent | ebcaf110b250cd55281500fa1debef806ab490f0 (diff) | |
dsa_check: Perform simple parameter check if seed is not available
Added primality check on p and q in the ossl_ffc_params_simple_validate().
Checking for p and q sizes in the default provider is made more
lenient.
Added two testcases for invalid parameters.
Fixes #13950
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14148)
Diffstat (limited to 'test')
| -rw-r--r-- | test/recipes/15-test_dsaparam.t | 10 | ||||
| -rw-r--r-- | test/recipes/15-test_dsaparam_data/invalid/p2048_q256_bad_q.pem | 14 | ||||
| -rw-r--r-- | test/recipes/15-test_dsaparam_data/invalid/p768_q160_too_small.pem | 7 |
3 files changed, 26 insertions, 5 deletions
diff --git a/test/recipes/15-test_dsaparam.t b/test/recipes/15-test_dsaparam.t index c0c73841bd..c34d8ec9cd 100644 --- a/test/recipes/15-test_dsaparam.t +++ b/test/recipes/15-test_dsaparam.t @@ -64,15 +64,15 @@ plan skip_all => "DSA isn't supported in this build" if disabled("dsa"); my @valid = glob(data_file("valid", "*.pem")); -#my @invalid = glob(data_file("invalid", "*.pem")); +my @invalid = glob(data_file("invalid", "*.pem")); -my $num_tests = scalar @valid; +my $num_tests = scalar @valid + scalar @invalid; plan tests => $num_tests; foreach (@valid) { ok(run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); } -#foreach (@invalid) { -# ok(!run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); -#} +foreach (@invalid) { + ok(!run(app([qw{openssl pkeyparam -noout -check -in}, $_]))); +} diff --git a/test/recipes/15-test_dsaparam_data/invalid/p2048_q256_bad_q.pem b/test/recipes/15-test_dsaparam_data/invalid/p2048_q256_bad_q.pem new file mode 100644 index 0000000000..6f7d98ddfb --- /dev/null +++ b/test/recipes/15-test_dsaparam_data/invalid/p2048_q256_bad_q.pem @@ -0,0 +1,14 @@ +-----BEGIN DSA PARAMETERS----- +MIICLAKCAQEAwmWp4Y+deYlczoQUPiioJt6Qxthrk6L1CAVpGH2uRRlHfTl41WUX +JHIJyCMBgRDtVVQdyAQ7AZ+CxOl1wpazvGJddyQVynhmIFsaUwHF2fYIT00MvBRL +9VA5PQqUmX2Tnog5ezu35CTsEqlBTOYcGqkQ7ctNVjfvjYCkwzvTxJS/Qsvki+dA +fE7NDWe+9r5QjSGEFZtH45alIM4qUnBS1mcN2Az5+S8JxPiivY5Jkt0pXoRQnvCM +In4bHjM8ZOVmLxFCIrpB0dNgKDg+2zEjRjmL7B4aZRcO7wDyrtDPc7jiYPH/rlt/ +wU1o/Y1fnzN9+R3f0AMeWR44bqf5Ol9jVQIhAKDEbXZJcYLbvkUYWBr8TKsVu2hc +H57M3PwkTsq+v2/dAoIBADKkGYUe9qsp4mqxkBKaEdpcjmjfLrvtE+3ikipPPGHh +tbAX7NwZc9WCyhniKYskEbJBWsuAZJXDgIRNaSpCVLK7dd9fx8ZnIKJESO6Htv1z +JfSIST57xW8L6m78Lq2kxpr5dVcm7I4pelTfL5jscTURm/1Ua+2skI9YlZU/Vgux +Wrr30H8bp4fUgWjcgPJbeirSY7xVI8FKrQaES0s4NRFbgGMFUrEGddBF0bgaGkwd +mFEpcXAEQDTJV7SPJp3rbjFug3CF4Atw3RmkV2T/sHAbplyr9YsQDmAQDhPsaWjQ +eSsoRUq0aQ4aa2V4X/gSzSj9It3Q4ngQwkGGOPJEo44= +-----END DSA PARAMETERS----- diff --git a/test/recipes/15-test_dsaparam_data/invalid/p768_q160_too_small.pem b/test/recipes/15-test_dsaparam_data/invalid/p768_q160_too_small.pem new file mode 100644 index 0000000000..c717c917a1 --- /dev/null +++ b/test/recipes/15-test_dsaparam_data/invalid/p768_q160_too_small.pem @@ -0,0 +1,7 @@ +-----BEGIN DSA PARAMETERS----- +MIHcAmEA702xO4DjQl4WxLId1FR8Q0tZ+FQDEqyhzfYheBnLra8Uaf3gLp7V0g52 +aQqDTeY1TK76ZmNo/SvESDcYTHjlgKphYCKLRxAhvuyGfX1RRPWa80BrM76wYtJD +mwB9KSBnAhUArp9BUvskZ9/K8Bzo0MVejsHC6AkCYEugdq5OD0HjCrxt3hFMD3sJ +ZQ7VAZa+Fnu9SJNjCeMYLEww4/A6fktqokDWITjSQpdJAAxwc+r8OlDRwBb0q7jT +w1IDvvbF/xGex5VzHHBZmQU1G1jH+Lq3h7dQ6d4l+g== +-----END DSA PARAMETERS----- |