summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Westerbaan <bas@westerbaan.name>2016-05-27 10:41:52 +0200
committerTim Graham <timograham@gmail.com>2016-05-27 18:37:37 -0400
commitc6aa941978b02138975123514f733ee9c99b0c28 (patch)
treed9d7b8b13ad45c416300f2ff75f411428a7b1e5f
parent85ab56944df7f48e3a8b1734c91fd90cb41bfd2f (diff)
[1.10.x] Fixed #26635 -- Clarified Argon2PasswordHasher's memory_cost differs from command line utility.
Backport of 9407cc966b02e5ef69b7f561a6b972aff5d9c2e0 from master
-rw-r--r--docs/topics/auth/passwords.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
index 578d917cf4..aaeb929d81 100644
--- a/docs/topics/auth/passwords.txt
+++ b/docs/topics/auth/passwords.txt
@@ -232,6 +232,12 @@ follows:
Pick a ``time_cost`` that takes an acceptable time for you.
If ``time_cost`` set to 1 is unacceptably slow, lower ``memory_cost``.
+.. admonition:: ``memory_cost`` interpretation
+
+ The argon2 command-line utility and some other libraries interpret the
+ ``memory_cost`` parameter differently from the value that Django uses. The
+ conversion is given by ``memory_cost == 2 ** memory_cost_commandline``.
+
.. _password-upgrades:
Password upgrading