Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hacker <dd0t@users.sourceforge.net>2014-12-23 00:42:38 +0300
committerStefan Hacker <dd0t@users.sourceforge.net>2014-12-23 00:42:38 +0300
commit88cf21d645a54d6dcecfb86f704d05c5e1d3e292 (patch)
tree5c0338cdb995383f2da3d78f02f3125d90f397ba /scripts
parent2438f31eb4f744a1e30d20f875638231334bc093 (diff)
parentb923e067f0c56145583e7120e883bef758d0424b (diff)
Merge pull request #1422 from hacst/auth
Use PBKDF2 for user password hashing (2)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/murmur.ini9
1 files changed, 9 insertions, 0 deletions
diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 98ccc43a3..d103a0aa8 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -172,6 +172,15 @@ users=100
# system.
#sendversion=True
+# This sets password hash storage to legacy mode (1.2.4 and before)
+# (Note that setting this to true is insecure and should not be used unless absolutely necessary)
+#legacyPasswordHash=false
+
+# By default a strong amount of PBKDF2 iterations are chosen automatically. If >0 this setting
+# overrides the automatic benchmark and forces a specific number of iterations.
+# (Note that you should only change this value if you know what you are doing)
+#kdfIterations=-1
+
# You can configure any of the configuration options for Ice here. We recommend
# leave the defaults as they are.
# Please note that this section has to be last in the configuration file.