aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorlloyd <[email protected]>2012-10-03 15:06:20 +0000
committerlloyd <[email protected]>2012-10-03 15:06:20 +0000
commit8bd5519105f6978e7d937294d2a2e8deadda20ca (patch)
treeb24f1e49d99f546e11818f48b9a7e2f066c10709 /doc
parent7e0820857855d1e60ff886083bd30ec682c612fd (diff)
SHA-3 announced. Also mention the combiners.
Diffstat (limited to 'doc')
-rw-r--r--doc/algos.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/algos.rst b/doc/algos.rst
index 119b81a7f..b6814119b 100644
--- a/doc/algos.rst
+++ b/doc/algos.rst
@@ -22,8 +22,9 @@ primitives, including:
* Hash functions
* NIST hashes: SHA-1, SHA-224, SHA-256, SHA-384, and SHA-512
+ * SHA-3 (Keccak) and SHA-3 candidates Skein-512 and Blue Midnight Wish-512
* RIPE hashes: RIPEMD-160 and RIPEMD-128
- * SHA-3 candidates Skein-512, Keccak, and Blue Midnight Wish-512
+ * Hash function combiners (Parallel and Comb4P)
* Other common hash functions Whirlpool and Tiger
* National standard hashes HAS-160 and GOST 34.11
* Obsolete or insecure hashes MD5, MD4, MD2