diff options
| author | Shane Lontis <shane.lontis@oracle.com> | 2020-09-04 09:55:28 +0200 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2020-09-18 15:20:39 +0200 |
| commit | 7a810fac866c6c1d93015999633ee2a29f17b3d2 (patch) | |
| tree | 5d66eb98a8120b53d5f916735864096d003fb180 /test/evp_test.c | |
| parent | fix provider exchange operations (diff) | |
| download | openssl-7a810fac866c6c1d93015999633ee2a29f17b3d2.tar.xz openssl-7a810fac866c6c1d93015999633ee2a29f17b3d2.zip | |
Add 'fips-securitychecks' option and plumb this into the actual fips checks
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/12745)
Diffstat (limited to 'test/evp_test.c')
| -rw-r--r-- | test/evp_test.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/evp_test.c b/test/evp_test.c index b8ca4a1915..14ea4a8496 100644 --- a/test/evp_test.c +++ b/test/evp_test.c @@ -3443,7 +3443,14 @@ start: } for (pp++, i = 1; i < (t->s.numpairs - skip_availablein); pp++, i++) { - if (strcmp(pp->key, "Availablein") == 0) { + if (strcmp(pp->key, "Securitycheck") == 0) { +#if defined(OPENSSL_NO_FIPS_SECURITYCHECKS) + TEST_info("skipping, securitycheck is not available: %s:%d", + t->s.test_file, t->s.start); + t->skip = 1; + return 0; +#endif + } else if (strcmp(pp->key, "Availablein") == 0) { TEST_info("Line %d: 'Availablein' should be the first option", t->s.curr); return 0; |