X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=basic%2Fruntime%2Forg.argeo.basic.nodeps%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Futil%2Fcrypto%2FPBEKeySpecCallback.java;h=676b9706f1272d51178030869ec65f46dbdbcd58;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=a0fe3e0ff8f48a12f8995e57c44da5e3916f21b9;hpb=4310414c41cc0b9e52866f81ec6c60bbf6686d16;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..676b9706f 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
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Mathieu Baudier
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.argeo.util.crypto;
 
 import javax.crypto.spec.PBEKeySpec;
@@ -17,6 +32,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 +43,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 +67,12 @@ public class PBEKeySpecCallback implements Callback {
 		return secretKeyEncryption;
 	}
 
+	public String getEncryptedPasswordHashCipher() {
+		return encryptedPasswordHashCipher;
+	}
+
+	public byte[] getEncryptedPasswordHash() {
+		return encryptedPasswordHash;
+	}
+
 }