Review and refactor of PBKDF2 support patch.

* Adjusted to coding guidelines
* Pulled out PBKDF2 functionality into own class
* Make benchmark a best of N approach with guaranteed minimum
* Fixed broken database migration code. Don't try to alter
  tables and instead rely on them being re-created with the
  new fields.
* Fixed some typos in ini. Also move to the setting to the
  end so ppl. don't get the idea they have to change this.
* Chose a scarier name for the plain hash function
* Use int instead of size_t for iteration counts as it is
  the datatype used in the OpenSSL API. Otherwise we just
  have to much pain with constantly converting and might
  expose ourselves to size issues in the future.
* Moved new UserInfo enum entry to the end as to preserve
  the order

1 files changed, 9 insertions, 8 deletions

diff --git a/scripts/murmur.ini b/scripts/murmur.ini
index 77cb13a62..cef4f17d9 100644
--- a/scripts/murmur.ini
+++ b/scripts/murmur.ini
@@ -129,14 +129,6 @@ users=100
 # Allow clients to use HTML in messages, user comments and channel descriptions?
 #allowhtml=true
 
-# This sets password hash storage to legacy mode (1.2.4 and before)
-# (Note that this is insecure and should not be changed this unless absolutely needed)
-#legacyPasswordwHash=false
-
-# This overrides the global default for kdf iterations, if used for password authentications
-# (Note that you should only change this value if know both what you want and what you are doing)
-#kdfIterations=0
-
 # Murmur retains the per-server log entries in an internal database which
 # allows it to be accessed over D-Bus/ICE.
 # How many days should such entries be kept?
@@ -180,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)
+#legacyPasswordwHash=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.