diff options
| author | Werner Koch <wk@gnupg.org> | 2015-08-08 10:47:55 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2015-08-08 10:47:55 +0200 |
| commit | 0e17f7a05bba309a87811992aa47a77af9935b99 (patch) | |
| tree | 5d1c8cc673a6cd4cfb16d2cf154f2f9987d64d05 /cipher/md.c | |
| parent | 10789e3cdda7b944acb4b59624c34a2ccfaea6e5 (diff) | |
| download | libgcrypt-0e17f7a05bba309a87811992aa47a77af9935b99.tar.gz | |
Add framework to eventually support SHA3.
* src/gcrypt.h.in (GCRY_MD_SHA3_224, GCRY_MD_SHA3_256)
(GCRY_MD_SHA3_384, GCRY_MD_SHA3_512): New.
(GCRY_MAC_HMAC_SHA3_224, GCRY_MAC_HMAC_SHA3_256)
(GCRY_MAC_HMAC_SHA3_384, GCRY_MAC_HMAC_SHA3_512): New.
* cipher/keccak.c: New with stub functions.
* cipher/Makefile.am (EXTRA_libcipher_la_SOURCES): Add keccak.c.
* configure.ac (available_digests): Add sha3.
(USE_SHA3): New.
* src/fips.c (run_hmac_selftests): Add SHA3 to the required selftests.
* cipher/md.c (digest_list) [USE_SHA3]: Add standard SHA3 algos.
(md_open): Ditto for hmac processing.
* cipher/mac-hmac.c (map_mac_algo_to_md): Add mapping.
* cipher/hmac-tests.c (run_selftests): Prepare for tests.
* cipher/pubkey-util.c (get_hash_algo): Add "sha3-xxx".
--
Note that the algo GCRY_MD_SHA3_xxx are prelimanry. We should try to
sync them with OpenPGP.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'cipher/md.c')
| -rw-r--r-- | cipher/md.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cipher/md.c b/cipher/md.c index 3ab46efc..0c669caa 100644 --- a/cipher/md.c +++ b/cipher/md.c @@ -51,6 +51,12 @@ static gcry_md_spec_t *digest_list[] = &_gcry_digest_spec_sha512, &_gcry_digest_spec_sha384, #endif +#if USE_SHA3 + &_gcry_digest_spec_sha3_224, + &_gcry_digest_spec_sha3_256, + &_gcry_digest_spec_sha3_384, + &_gcry_digest_spec_sha3_512, +#endif #ifdef USE_GOST_R_3411_94 &_gcry_digest_spec_gost3411_94, &_gcry_digest_spec_gost3411_cp, @@ -333,6 +339,8 @@ md_open (gcry_md_hd_t *h, int algo, unsigned int flags) { case GCRY_MD_SHA384: case GCRY_MD_SHA512: + case GCRY_MD_SHA3_384: + case GCRY_MD_SHA3_512: ctx->macpads_Bsize = 128; break; case GCRY_MD_GOSTR3411_94: |