diff options
| author | Toke Høiland-Jørgensen <toke@toke.dk> | 2021-04-10 17:33:28 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2021-06-06 16:26:58 +0200 |
| commit | 725d9af94a6eaf3cbce1b107e36c8cf342828ea6 (patch) | |
| tree | 5d7533ca9ba06ad1c836e70f9efbeeeaf6130d9b /lib/mac.c | |
| parent | e5724f71d2c054bc51d66092beb6af4da21e0c62 (diff) | |
Lib: Add Blake2s and Blake2b hash functions
The Babel MAC authentication RFC recommends implementing Blake2s as one of
the supported algorithms. In order to achieve do this, add the blake2b and
blake2s hash functions for MAC authentication. The hashing function
implementations are the reference implementations from blake2.net.
The Blake2 algorithms allow specifying an arbitrary output size, and the
Babel MAC spec says to implement Blake2s with 128-bit output. To satisfy
this, we add two different variants of each of the algorithms, one using
the default size (256 bits for Blake2s, 512 bits for Blake2b), and one
using half the default output size.
Update to BIRD coding style done by committer.
Diffstat (limited to 'lib/mac.c')
| -rw-r--r-- | lib/mac.c | 28 |
1 files changed, 23 insertions, 5 deletions
@@ -32,6 +32,7 @@ #include "lib/sha1.h" #include "lib/sha256.h" #include "lib/sha512.h" +#include "lib/blake2.h" /* @@ -154,13 +155,26 @@ hmac_final(struct mac_context *ctx) * Common code */ -#define HASH_DESC(name, px, PX) \ - { name, PX##_SIZE, sizeof(struct nrmh_context), nrmh_init, nrmh_update, nrmh_final, \ - PX##_SIZE, PX##_BLOCK_SIZE, px##_init, px##_update, px##_final } +#define HASH_DESC(name, px, PX) \ + { \ + name, PX##_SIZE, sizeof(struct nrmh_context), \ + nrmh_init, nrmh_update, nrmh_final, \ + PX##_SIZE, PX##_BLOCK_SIZE, px##_init, px##_update, px##_final \ + } #define HMAC_DESC(name, px, PX) \ - { name, PX##_SIZE, sizeof(struct hmac_context), hmac_init, hmac_update, hmac_final, \ - PX##_SIZE, PX##_BLOCK_SIZE, px##_init, px##_update, px##_final } + { \ + name, PX##_SIZE, sizeof(struct hmac_context), \ + hmac_init, hmac_update, hmac_final, \ + PX##_SIZE, PX##_BLOCK_SIZE, px##_init, px##_update, px##_final \ + } + +#define BLAKE_DESC(name, vx, VX, size) \ + { \ + name, size/8, sizeof(struct vx##_context), \ + vx##_mac_init, vx##_mac_update, vx##_mac_final, \ + size/8, VX##_BLOCK_SIZE, NULL, NULL, NULL \ + } const struct mac_desc mac_table[ALG_MAX] = { [ALG_MD5] = HASH_DESC("Keyed MD5", md5, MD5), @@ -169,6 +183,10 @@ const struct mac_desc mac_table[ALG_MAX] = { [ALG_SHA256] = HASH_DESC("Keyed SHA-256", sha256, SHA256), [ALG_SHA384] = HASH_DESC("Keyed SHA-384", sha384, SHA384), [ALG_SHA512] = HASH_DESC("Keyed SHA-512", sha512, SHA512), + [ALG_BLAKE2S_128] = BLAKE_DESC("Blake2s-128", blake2s, BLAKE2S, 128), + [ALG_BLAKE2S_256] = BLAKE_DESC("Blake2s-256", blake2s, BLAKE2S, 256), + [ALG_BLAKE2B_256] = BLAKE_DESC("Blake2b-256", blake2b, BLAKE2B, 256), + [ALG_BLAKE2B_512] = BLAKE_DESC("Blake2b-512", blake2b, BLAKE2B, 512), [ALG_HMAC_MD5] = HMAC_DESC("HMAC-MD5", md5, MD5), [ALG_HMAC_SHA1] = HMAC_DESC("HMAC-SHA-1", sha1, SHA1), [ALG_HMAC_SHA224] = HMAC_DESC("HMAC-SHA-224", sha224, SHA224), |