Merge branch 'passwords' into multitool/public

# Conflicts:
#	src/de/steamwar/sql/SteamwarUser.java

src/de/steamwar/sql/SteamwarUser.java

@@ -251,7 +251,7 @@ public class SteamwarUser {
         random.nextBytes(salt);
         String saltString = Base64.getEncoder().encodeToString(salt);
 
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 128);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
         byte[] hash = factory.generateSecret(spec).getEncoded();
 
@@ -278,7 +278,7 @@ public class SteamwarUser {
         String saltString = parts[1];
         byte[] salt = Base64.getDecoder().decode(saltString);
 
-        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 128);
+        PBEKeySpec spec = new PBEKeySpec(password.toCharArray(), salt, 65536, 512);
         SecretKeyFactory factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA512");
         byte[] hash = factory.generateSecret(spec).getEncoded();