diff options
| author | Jack Lloyd <[email protected]> | 2016-11-26 05:31:31 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2016-11-26 05:31:31 -0500 |
| commit | 6f59f7adbbc65c1020e0468623ea65d6ab061bb4 (patch) | |
| tree | 9e216bbbdf4b53a8e83b6e02d69f00b3b0ccf3e3 | |
| parent | cc010f7c233949b908db6139bb3ccedb34372996 (diff) | |
| parent | 33762ef4d3dc43cde0c91f19f834627c0f124b30 (diff) | |
Merge GH #739 Update docs and BSI policy
| -rw-r--r-- | doc/credits.rst | 9 | ||||
| -rw-r--r-- | readme.rst | 2 | ||||
| -rw-r--r-- | src/build-data/policy/bsi.txt | 1 |
3 files changed, 10 insertions, 2 deletions
diff --git a/doc/credits.rst b/doc/credits.rst index cef62f0d4..e13e38c85 100644 --- a/doc/credits.rst +++ b/doc/credits.rst @@ -29,6 +29,13 @@ snail-mail address (S), and Bitcoin address (B). N: Olivier de Gaalon D: SQLite encryption codec (src/contrib/sqlite) + N: Matthias Gierlings + E: [email protected] + W: https://www.hackmanit.de/ + P: 39E0 D270 19A4 B356 05D0 29AE 1BD3 49CF 744A 02FF + D: GMAC, Extended Hash-Based Signatures (XMSS) + S: Bochum, Germany + N: Matthew Gregan D: Binary file I/O support, allocator fixes @@ -124,7 +131,7 @@ snail-mail address (S), and Bitcoin address (B). W: https://sirrix.com/ D: KDF1-18033, ECIES S: Saarland, Germany - + N: Daniel Neus W: https://sirrix.com/ diff --git a/readme.rst b/readme.rst index f7b79228b..cf8ba6d4a 100644 --- a/readme.rst +++ b/readme.rst @@ -195,7 +195,7 @@ Hash functions and MACs * SHA-3 (and Keccak-1600) * Skein-512, BLAKE2b * RIPEMD-160, Tiger, Whirlpool, GOST 34.11 -* Authentication codes HMAC, CMAC, Poly1305, SipHash +* Authentication codes CMAC, GMAC, HMAC, Poly1305, SipHash * Hash function combiners (Parallel and Comb4P) * Non-cryptographic checksums Adler32, CRC24, CRC32 * Obsolete algorithms MD5, MD4, CBC-MAC, X9.19 DES-MAC diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt index f1c40c9fa..3815f9c1f 100644 --- a/src/build-data/policy/bsi.txt +++ b/src/build-data/policy/bsi.txt @@ -14,6 +14,7 @@ ctr sha2_32 sha2_64 sha3 +shake # mac cmac |