aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2015-01-11 04:15:03 +0000
committerlloyd <[email protected]>2015-01-11 04:15:03 +0000
commitb07e980986bd62ecaa951140dbe2c472bbd60d3b (patch)
treebb39a25c5e79448ac1886407561e8c31980501c2 /doc
parent582e1cea2cb13c5d9d40610ff4566921f934ba27 (diff)
Add SipHash
Diffstat (limited to 'doc')
-rw-r--r--doc/dev/todo.rst1
-rw-r--r--doc/relnotes/1_11_13.rst2
-rw-r--r--doc/website/algos.rst3
3 files changed, 4 insertions, 2 deletions
diff --git a/doc/dev/todo.rst b/doc/dev/todo.rst
index 870fd294c..42f8690d1 100644
--- a/doc/dev/todo.rst
+++ b/doc/dev/todo.rst
@@ -13,7 +13,6 @@ Basic Algorithms
* scrypt
* BLAKE2
* EdDSA
- * SipHash
* Skein-MAC
* IETF standard HKDF (RFC 5869)
* ARIA (Korean block cipher, RFCs 5794 and 6209)
diff --git a/doc/relnotes/1_11_13.rst b/doc/relnotes/1_11_13.rst
index f617ec3b9..e3d9bced2 100644
--- a/doc/relnotes/1_11_13.rst
+++ b/doc/relnotes/1_11_13.rst
@@ -12,6 +12,8 @@ Version 1.11.13, Not Yet Released
* Add DTLS-SRTP negotiation defined in RFC 5764
+* Add SipHash
+
* Add SHA-512/256
* The format of serialized TLS sessions has changed. Additiionally, PEM
diff --git a/doc/website/algos.rst b/doc/website/algos.rst
index 5184564af..795f718e0 100644
--- a/doc/website/algos.rst
+++ b/doc/website/algos.rst
@@ -57,12 +57,13 @@ Hash functions
* Obsolete or insecure hashes MD5, MD4, MD2
* Non-cryptographic checksums Adler32, CRC24, CRC32
-Authentication Codes
+Authentication Codes and PRFs
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
* HMAC
* CMAC (aka OMAC1)
* Poly1305
+ * SipHash
* Obsolete designs CBC-MAC and ANSI X9.19 DES-MAC
Other Useful Things