aboutsummaryrefslogtreecommitdiffstats
path: root/lib/crypto/doc/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-02-06 11:38:05 +0100
committerGitHub <[email protected]>2019-02-06 11:38:05 +0100
commit3542afbdc4909455ad9e45e2b5328835a838a1bd (patch)
tree01b5bbd83c684737aaa3a46735f86a7a93b8e423 /lib/crypto/doc/src
parent152c7863a80c308075b6b67a704dd2234a4e28e2 (diff)
parent9aa84d39edef976250774811ac9a6e6895041c14 (diff)
downloadotp-3542afbdc4909455ad9e45e2b5328835a838a1bd.tar.gz
otp-3542afbdc4909455ad9e45e2b5328835a838a1bd.tar.bz2
otp-3542afbdc4909455ad9e45e2b5328835a838a1bd.zip
Merge pull request #2129 from hanssv/crypto/add_blake2_support
Add hash function BLAKE2 to crypto:hash/hmac OTP-15564
Diffstat (limited to 'lib/crypto/doc/src')
-rw-r--r--lib/crypto/doc/src/crypto.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 3306fe3d16..e0794a080e 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -44,6 +44,10 @@
SHA-3 Standard: Permutation-Based Hash and Extendable-Output Functions [FIPS PUB 202]
</url>
</item>
+ <tag>BLAKE2</tag>
+ <item>
+ <url href="https://blake2.net/">BLAKE2 — fast secure hashing</url>
+ </item>
<tag>MD5</tag>
<item>
<url href="http://www.ietf.org/rfc/rfc1321.txt">The MD5 Message Digest Algorithm [RFC 1321]</url>
@@ -235,6 +239,7 @@
<name name="sha1"/>
<name name="sha2"/>
<name name="sha3"/>
+ <name name="blake2"/>
<desc>
</desc>
</datatype>