Fix the dhparam_check test
authorMatt Caswell <matt@openssl.org>
Wed, 10 Feb 2021 12:29:36 +0000 (12:29 +0000)
committerShane Lontis <shane.lontis@oracle.com>
Mon, 15 Feb 2021 04:17:36 +0000 (14:17 +1000)
commit0217e53e33a9561c6d911df9ec7e99195be7de62
tree553787fd66f948ffaa08815ada8ffae5ebdcbb53
parent899e25643dc63a84a924d08f86d7d19613714431
Fix the dhparam_check test

genpkey can sometimes create files that fail "openssl dhparam -check". See
issue #14145. We had some instances of such invalid files in the
dhparam_check test. Now that "openssl dhparam -check" has been fixed to
work the same way as it did in 1.1.1 these tests were failing. We move the
invalid files inot the "invalid" directory. A future PR will have to fix
genpkey to not generate invalid files.

We also remove a "SKIP" block that was skipping tests in a no deprecated
build unnecessarily. Nothing being tested is deprecated.

Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14146)
test/recipes/20-test_dhparam_check.t
test/recipes/20-test_dhparam_check_data/invalid/dh5114_1_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh5114_1.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh5114_2_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh5114_2.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh5114_3_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh5114_3.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh_p1024_t1862_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh_p1024_t1862.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1862_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1862.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh_p2048_t1864_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh_p2048_t1864.pem with 100% similarity]
test/recipes/20-test_dhparam_check_data/invalid/dh_p3072_t1862_pkcs3.pem [moved from test/recipes/20-test_dhparam_check_data/valid/dh_p3072_t1862.pem with 100% similarity]