aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual/pbkdf.rst
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual/pbkdf.rst')
-rw-r--r--doc/manual/pbkdf.rst8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/manual/pbkdf.rst b/doc/manual/pbkdf.rst
index 6539c6f0f..92f59f278 100644
--- a/doc/manual/pbkdf.rst
+++ b/doc/manual/pbkdf.rst
@@ -150,6 +150,14 @@ with this function:
As a general recommendation, use N=32768, r=8, p=1
+Argon2
+^^^^^^^^^^
+
+.. versionadded:: 2.11.0
+
+Argon2 is the winner of the PHC (Password Hashing Competition) and
+provides a tunable memory hard PBKDF.
+
OpenPGP S2K
^^^^^^^^^^^^