summaryrefslogtreecommitdiff
path: root/cipher/cipher.c
diff options
context:
space:
mode:
authorVitezslav Cizek <vcizek@suse.com>2015-10-29 17:13:16 +0100
committerWerner Koch <wk@gnupg.org>2016-03-18 15:48:15 +0100
commitce1cbe16992a7340edcf8e6576973e3508267640 (patch)
treeab4d7c4b3429f83878803f1db98df8830a856dc9 /cipher/cipher.c
parentc478cf175887c84dc071c4f73a7667603b354789 (diff)
downloadlibgcrypt-ce1cbe16992a7340edcf8e6576973e3508267640.tar.gz
Disable non-allowed algorithms in FIPS mode
* cipher/cipher.c (_gcry_cipher_init), * cipher/mac.c (_gcry_mac_init), * cipher/md.c (_gcry_md_init), * cipher/pubkey.c (_gcry_pk_init): In the FIPS mode, disable all the non-allowed ciphers. * cipher/md5.c: Mark MD5 as not allowed in FIPS. * src/g10lib.h (_gcry_mac_init): New. * src/global.c (global_init): Call the new _gcry_mac_init. * tests/basic.c (check_ciphers): Fix a typo. -- When running in the FIPS mode, disable all the ciphers that don't have the fips flag set. Skip the non-allowed algos during testing in the FIPS mode. Thanks to Ludwig Nussel. Signed-off-by: Vitezslav Cizek <vcizek@suse.com> Signed-off-by: Vitezslav Cizek <vcizek@suse.com>
Diffstat (limited to 'cipher/cipher.c')
-rw-r--r--cipher/cipher.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 802ffad8..a0138466 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -1514,6 +1514,17 @@ _gcry_cipher_get_algo_blklen (int algo)
gcry_err_code_t
_gcry_cipher_init (void)
{
+ if (fips_mode())
+ {
+ /* disable algorithms that are disallowed in fips */
+ int idx;
+ gcry_cipher_spec_t *spec;
+
+ for (idx = 0; (spec = cipher_list[idx]); idx++)
+ if (!spec->flags.fips)
+ spec->flags.disabled = 1;
+ }
+
return 0;
}