@@ -16876,16 +16876,14 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo,
1687616876 NULL,
1687716877 0,
1687816878 0,
16879- 0,
16880- FLAG_NOFIPS },
16879+ 0 },
1688116880 { GCRY_PK_RSA,
1688216881 "(data\n (flags pkcs1)\n"
1688316882 " (value #11223344556677889900AA#))\n",
1688416883 "(flags pkcs1)",
1688516884 1,
1688616885 0,
16887- 0,
16888- FLAG_NOFIPS },
16886+ 0 },
1688916887 { GCRY_PK_RSA,
1689016888 "(data\n (flags oaep)\n"
1689116889 " (value #11223344556677889900AA#))\n",
@@ -16987,8 +16985,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo,
1698716985 die ("converting data failed: %s\n", gpg_strerror (rc));
1698816986
1698916987 rc = gcry_pk_encrypt (&ciph, data, pkey);
16990- if (in_fips_mode && ((flags & FLAG_NOFIPS) ||
16991- (datas[dataidx].flags & FLAG_NOFIPS)))
16988+ if (in_fips_mode && (flags & FLAG_NOFIPS))
1699216989 {
1699316990 if (!rc)
1699416991 fail ("gcry_pk_encrypt did not fail as expected in FIPS mode\n");
@@ -17037,7 +17034,7 @@ check_pubkey_crypt (int n, gcry_sexp_t skey, gcry_sexp_t pkey, int algo,
1703717034 ciph = list;
1703817035 }
1703917036 rc = gcry_pk_decrypt (&plain, ciph, skey);
17040- if (( !rc || in_fips_mode) && (datas[dataidx].flags & FLAG_SPECIAL))
17037+ if (!rc && (datas[dataidx].flags & FLAG_SPECIAL))
1704117038 {
1704217039 /* It may happen that OAEP formatted data which is
1704317040 decrypted as pkcs#1 data returns a valid pkcs#1
0 commit comments