From c6aa941978b02138975123514f733ee9c99b0c28 Mon Sep 17 00:00:00 2001
From: Bas Westerbaan <bas@westerbaan.name>
Date: Fri, 27 May 2016 10:41:52 +0200
Subject: [PATCH] [1.10.x] Fixed #26635 -- Clarified Argon2PasswordHasher's
memory_cost differs from command line utility.
Backport of 9407cc966b02e5ef69b7f561a6b972aff5d9c2e0 from master
---
docs/topics/auth/passwords.txt | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/docs/topics/auth/passwords.txt b/docs/topics/auth/passwords.txt
index 578d917cf40..aaeb929d81a 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