Do not allow PKCS #1.5 padding for encryption in FIPS

* cipher/pubkey-util.c (_gcry_pk_util_data_to_mpi): Block PKCS #1.5 padding for encryption in FIPS mode * cipher/rsa.c (rsa_decrypt): Block PKCS #1.5 decryption in FIPS mode -- GnuPG-bug-id: 5918 Signed-off-by: Jakub Jelen <[email protected]>
ShiftMediaProject · Apr 21, 2022 · c7709f7 · c7709f7
1 parent f436bf4
commit c7709f7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/cipher/pubkey-util.c b/cipher/pubkey-util.c
@@ -957,7 +957,10 @@ _gcry_pk_util_data_to_mpi (gcry_sexp_t input, gcry_mpi_t *ret_mpi,
       void *random_override = NULL;
       size_t random_override_len = 0;
 
-      if ( !(value=sexp_nth_data (lvalue, 1, &valuelen)) || !valuelen )
+      /* The RSA PKCS#1.5 encryption is no longer supported by FIPS */
+      if (fips_mode ())
+        rc = GPG_ERR_INV_FLAG;
+      else if ( !(value=sexp_nth_data (lvalue, 1, &valuelen)) || !valuelen )
         rc = GPG_ERR_INV_OBJ;
       else
         {

diff --git a/cipher/rsa.c b/cipher/rsa.c
@@ -1391,6 +1391,11 @@ rsa_decrypt (gcry_sexp_t *r_plain, gcry_sexp_t s_data, gcry_sexp_t keyparms)
       rc = GPG_ERR_INV_DATA;
       goto leave;
     }
+  if (fips_mode () && (ctx.encoding == PUBKEY_ENC_PKCS1))
+    {
+      rc = GPG_ERR_INV_FLAG;
+      goto leave;
+    }
 
   /* Extract the key.  */
   rc = sexp_extract_param (keyparms, NULL, "nedp?q?u?",