diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2022-01-19 11:41:40 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2022-01-19 11:41:40 +0900 |
| commit | 76aad97dd312e83f2f9b8d086553f2b72ab6546f (patch) | |
| tree | 40d41c810f9cff3ebbdae697fceaec5ee2d49928 /cipher/md.c | |
| parent | 6f225308d3e59f8749403ad743d8e6c591142f8f (diff) | |
| download | libgcrypt-76aad97dd312e83f2f9b8d086553f2b72ab6546f.tar.gz | |
fips: Reject shorter key for HMAC in FIPS mode.
* cipher/md.c (prepare_macpads): Reject < 112-bit key.
* cipher/kdf.c (selftest_pbkdf2): Remove selftest cases with shorter
key.
* cipher/mac-hmac.c (selftests_sha224, selftests_sha256): Likewise.
(selftests_sha384, selftests_sha512, selftests_sha3): Likewise.
* tests/basic.c (check_one_hmac) Handle an error when shorter key
is rejected.
(check_one_mac): Likewise.
* tests/t-kdf.c (check_pbkdf2, check_scrypt): Likewise.
--
GnuPG-bug-id: 5512
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'cipher/md.c')
| -rw-r--r-- | cipher/md.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/cipher/md.c b/cipher/md.c index 34336b5c..4f4fc9bf 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -903,6 +903,9 @@ prepare_macpads (gcry_md_hd_t a, const unsigned char *key, size_t keylen) { GcryDigestEntry *r; + if (fips_mode () && keylen < 14) + return GPG_ERR_INV_VALUE; + if (!a->ctx->list) return GPG_ERR_DIGEST_ALGO; /* Might happen if no algo is enabled. */ |