X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Futil%2Fcrypto%2FPBEKeySpecCallback.java;h=f534c6ae7b981ccd4a3901ee7990166d9580b87f;hb=70538e1286a2b47ecd58cb1cfb7ede8dddff5859;hp=a0fe3e0ff8f48a12f8995e57c44da5e3916f21b9;hpb=e1c4cc6aaa5a1f536407875bf9cf5799dc0fb54f;p=lgpl%2Fargeo-commons.git

diff --git a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/crypto/PBEKeySpecCallback.java b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/crypto/PBEKeySpecCallback.java
index a0fe3e0ff..f534c6ae7 100644
--- a/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/crypto/PBEKeySpecCallback.java
+++ b/basic/runtime/org.argeo.basic.nodeps/src/main/java/org/argeo/util/crypto/PBEKeySpecCallback.java
@@ -17,6 +17,9 @@ public class PBEKeySpecCallback implements Callback {
 	/** Can be null, will trigger secret key encryption if not */
 	private String secretKeyEncryption;
 
+	private String encryptedPasswordHashCipher;
+	private byte[] encryptedPasswordHash;
+
 	public void set(String secretKeyFactory, byte[] salt,
 			Integer iterationCount, Integer keyLength,
 			String secretKeyEncryption) {
@@ -25,6 +28,8 @@ public class PBEKeySpecCallback implements Callback {
 		this.iterationCount = iterationCount;
 		this.keyLength = keyLength;
 		this.secretKeyEncryption = secretKeyEncryption;
+//		this.encryptedPasswordHashCipher = encryptedPasswordHashCipher;
+//		this.encryptedPasswordHash = encryptedPasswordHash;
 	}
 
 	public String getSecretKeyFactory() {
@@ -47,4 +52,12 @@ public class PBEKeySpecCallback implements Callback {
 		return secretKeyEncryption;
 	}
 
+	public String getEncryptedPasswordHashCipher() {
+		return encryptedPasswordHashCipher;
+	}
+
+	public byte[] getEncryptedPasswordHash() {
+		return encryptedPasswordHash;
+	}
+
 }