From 93a9a3e697c06bb613201d7eb55559b38b92aa3d Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Mon, 22 May 2017 14:38:42 +0200
Subject: [PATCH] [Major] Privilege passwords are now salted!

---
 runtime/config/PrivilegeConfig.xml | 8 +++++++-
 runtime/config/PrivilegeUsers.xml  | 4 ++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/runtime/config/PrivilegeConfig.xml b/runtime/config/PrivilegeConfig.xml
index a188f31..4a42aa4 100644
--- a/runtime/config/PrivilegeConfig.xml
+++ b/runtime/config/PrivilegeConfig.xml
@@ -14,7 +14,13 @@
 
         <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
             <Parameters>
-                <Parameter name="hashAlgorithm" value="SHA-256"/>
+                <!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
+				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
+				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
+				<!-- default iterations: 200000 -->
+				<Parameter name="hashIterations" value="10000" />
+				<!-- default key length: 256 -->
+				<Parameter name="hashKeyLength" value="256" />
             </Parameters>
         </EncryptionHandler>
 
diff --git a/runtime/config/PrivilegeUsers.xml b/runtime/config/PrivilegeUsers.xml
index 728996c..13bd738 100644
--- a/runtime/config/PrivilegeUsers.xml
+++ b/runtime/config/PrivilegeUsers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Users>
 
-	<User userId="U10" username="jill" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918">
+	<User userId="U10" username="jill" password="cb69962946617da006a2f95776d78b49e5ec7941d2bdb2d25cdb05f957f64344" salt="61646d696e">
 		<Firstname>Jill</Firstname>
 		<Lastname>Someone</Lastname>
 		<State>ENABLED</State>
@@ -15,7 +15,7 @@
 		</Properties>
 	</User>
 
-	<User userId="U01" username="admin" password="8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918">
+	<User userId="U01" username="admin" password="cb69962946617da006a2f95776d78b49e5ec7941d2bdb2d25cdb05f957f64344" salt="61646d696e">
 		<Firstname>Jill</Firstname>
 		<Lastname>Someone</Lastname>
 		<State>ENABLED</State>