X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=security%2Fruntime%2Forg.argeo.security.core%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fjcr%2FJcrKeyring.java;h=1b9f24426704b76be8b8224dcc7ff8e6af1d7dac;hb=3ea877ebf1b76ffd20319f45b535da45b38e2439;hp=04974bdd7bd9281ede437f283b9d0476f9e54852;hpb=9884b3225a86b831917b10376925eebcbf99e513;p=lgpl%2Fargeo-commons.git

diff --git a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java
index 04974bdd7..1b9f24426 100644
--- a/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java
+++ b/security/runtime/org.argeo.security.core/src/main/java/org/argeo/security/jcr/JcrKeyring.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Mathieu Baudier
+ * Copyright (C) 2007-2012 Argeo GmbH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,21 @@ import org.argeo.security.crypto.PBEKeySpecCallback;
 
 /** JCR based implementation of a keyring */
 public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
+	/**
+	 * Stronger with 256, but causes problem with Oracle JVM, force 128 in this
+	 * case
+	 */
+	public final static Long DEFAULT_SECRETE_KEY_LENGTH = 256l;
+	public final static String DEFAULT_SECRETE_KEY_FACTORY = "PBKDF2WithHmacSHA1";
+	public final static String DEFAULT_SECRETE_KEY_ENCRYPTION = "AES";
+	public final static String DEFAULT_CIPHER_NAME = "AES/CBC/PKCS5Padding";
+
+	private Integer iterationCountFactor = 200;
+	private Long secreteKeyLength = DEFAULT_SECRETE_KEY_LENGTH;
+	private String secreteKeyFactoryName = DEFAULT_SECRETE_KEY_FACTORY;
+	private String secreteKeyEncryption = DEFAULT_SECRETE_KEY_ENCRYPTION;
+	private String cipherName = DEFAULT_CIPHER_NAME;
+
 	private Session session;
 
 	/**
@@ -97,15 +112,16 @@ public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
 			binary = session.getValueFactory().createBinary(in);
 			keyring.setProperty(ARGEO_SALT, binary);
 
-			Integer iterationCount = username.length() * 200;
+			Integer iterationCount = username.length() * iterationCountFactor;
 			keyring.setProperty(ARGEO_ITERATION_COUNT, iterationCount);
 
 			// default algo
 			// TODO check if algo and key length are available, use DES if not
-			keyring.setProperty(ARGEO_SECRET_KEY_FACTORY, "PBKDF2WithHmacSHA1");
-			keyring.setProperty(ARGEO_KEY_LENGTH, 256l);
-			keyring.setProperty(ARGEO_SECRET_KEY_ENCRYPTION, "AES");
-			keyring.setProperty(ARGEO_CIPHER, "AES/CBC/PKCS5Padding");
+			keyring.setProperty(ARGEO_SECRET_KEY_FACTORY, secreteKeyFactoryName);
+			keyring.setProperty(ARGEO_KEY_LENGTH, secreteKeyLength);
+			keyring.setProperty(ARGEO_SECRET_KEY_ENCRYPTION,
+					secreteKeyEncryption);
+			keyring.setProperty(ARGEO_CIPHER, cipherName);
 
 			// encrypted password hash
 			// IOUtils.closeQuietly(in);
@@ -254,4 +270,25 @@ public class JcrKeyring extends AbstractKeyring implements ArgeoNames {
 	public synchronized void setSession(Session session) {
 		this.session = session;
 	}
+
+	public void setIterationCountFactor(Integer iterationCountFactor) {
+		this.iterationCountFactor = iterationCountFactor;
+	}
+
+	public void setSecreteKeyLength(Long keyLength) {
+		this.secreteKeyLength = keyLength;
+	}
+
+	public void setSecreteKeyFactoryName(String secreteKeyFactoryName) {
+		this.secreteKeyFactoryName = secreteKeyFactoryName;
+	}
+
+	public void setSecreteKeyEncryption(String secreteKeyEncryption) {
+		this.secreteKeyEncryption = secreteKeyEncryption;
+	}
+
+	public void setCipherName(String cipherName) {
+		this.cipherName = cipherName;
+	}
+
 }
\ No newline at end of file