Merge branch 'master' of gitlab.iaik.tugraz.at:egiz/moa-idspssHEADmaster

1 files changed, 19 insertions, 21 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/AuthenticationHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/AuthenticationHelper.java
index 4d47d8d96..25cf87aa9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/AuthenticationHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/AuthenticationHelper.java
@@ -29,29 +29,27 @@ import javax.crypto.SecretKeyFactory;
 import javax.crypto.spec.PBEKeySpec;
 import javax.crypto.spec.SecretKeySpec;
 
-import org.apache.log4j.Logger;
-
 import at.gv.egovernment.moa.util.Base64Utils;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class AuthenticationHelper {
-	
-	private static final Logger log = Logger.getLogger(AuthenticationHelper.class);
-	
-	public static String generateKeyFormPassword(String password) {
-		SecretKeyFactory factory;
-
-		try {
-			factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
-			KeySpec spec = new PBEKeySpec(password.toCharArray(), "TestSALT".getBytes(), 1024, 128);
-			SecretKey tmp = factory.generateSecret(spec);
-			SecretKeySpec secret = new SecretKeySpec(tmp.getEncoded(), "AES");
-			return Base64Utils.encode(secret.getEncoded());
-			
-		} catch (Exception e) {
-			log.info("Key generation form password failed.");
-			return null;
-		}
-		
-	}
+
+  public static String generateKeyFormPassword(String password) {
+    SecretKeyFactory factory;
+
+    try {
+      factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA1");
+      final KeySpec spec = new PBEKeySpec(password.toCharArray(), "TestSALT".getBytes(), 1024, 128);
+      final SecretKey tmp = factory.generateSecret(spec);
+      final SecretKeySpec secret = new SecretKeySpec(tmp.getEncoded(), "AES");
+      return Base64Utils.encode(secret.getEncoded());
+
+    } catch (final Exception e) {
+      log.info("Key generation form password failed.");
+      return null;
+    }
+
+  }
 
 }