diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2022-10-05 16:59:35 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-10-19 10:36:45 +0900 |
| commit | 9d56af04dce0795d30374fd575a8500fcf0ae158 (patch) | |
| tree | 16637d9b5ac4ee76a056523b717e2a785380f0de /tests | |
| parent | a7b5cab05f6a7de23c565b1303eb3f198d0b7e2b (diff) | |
| download | libgcrypt-9d56af04dce0795d30374fd575a8500fcf0ae158.tar.gz | |
Revert "tests: Expect the OEAP tests to fail in FIPS mode."
This reverts commit 249ca431ef881d510b90a5d3db9cd8507c4d697b. The pubkey
encryption has already separate explicit FIPS service indicator.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic.c | 14 | ||||
| -rw-r--r-- | tests/pkcs1v2.c | 13 |
2 files changed, 5 insertions, 22 deletions
diff --git a/tests/basic.c b/tests/basic.c index b4102c9f..26980e15 100644 --- a/tests/basic.c +++ b/tests/basic.c @@ -16892,24 +16892,21 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, "(flags oaep)", 1, 0, - 0, - FLAG_NOFIPS }, + 0 }, { GCRY_PK_RSA, "(data\n (flags oaep)\n (hash-algo sha1)\n" " (value #11223344556677889900AA#))\n", "(flags oaep)(hash-algo sha1)", 1, 0, - 0, - FLAG_NOFIPS }, + 0 }, { GCRY_PK_RSA, "(data\n (flags oaep)\n (hash-algo sha1)\n (label \"test\")\n" " (value #11223344556677889900AA#))\n", "(flags oaep)(hash-algo sha1)(label \"test\")", 1, 0, - 0, - FLAG_NOFIPS }, + 0 }, { GCRY_PK_RSA, "(data\n (flags oaep)\n (hash-algo sha1)\n (label \"test\")\n" " (value #11223344556677889900AA#)\n" @@ -16917,8 +16914,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, "(flags oaep)(hash-algo sha1)(label \"test\")", 1, 0, - 0, - FLAG_NOFIPS }, + 0 }, { 0, "(data\n (flags )\n" " (value #11223344556677889900AA#))\n", NULL, @@ -16964,7 +16960,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo, "(flags pkcs1)", 1, 0, - GPG_ERR_ENCODING_PROBLEM, FLAG_SPECIAL | FLAG_NOFIPS }, + GPG_ERR_ENCODING_PROBLEM, FLAG_SPECIAL }, { 0, "(data\n (flags pss)\n" " (value #11223344556677889900AA#))\n", diff --git a/tests/pkcs1v2.c b/tests/pkcs1v2.c index 2fd495d5..6c7f3d81 100644 --- a/tests/pkcs1v2.c +++ b/tests/pkcs1v2.c @@ -186,24 +186,11 @@ check_oaep (void) err = gcry_pk_encrypt (&ciph, plain, pub_key); if (err) { - if (in_fips_mode) - { - gcry_sexp_release (plain); - plain = NULL; - continue; - } show_sexp ("plain:\n", ciph); fail ("gcry_pk_encrypt failed: %s\n", gpg_strerror (err)); } else { - if (in_fips_mode) - { - fail ("The OAEP encryption unexpectedly worked in FIPS mode\n"); - gcry_sexp_release (plain); - plain = NULL; - continue; - } if (extract_cmp_data (ciph, "a", tbl[tno].m[mno].encr, tbl[tno].m[mno].desc)) { |