diff options
Diffstat (limited to 'src/com/isode/stroke/stringcodecs/PBKDF2.java')
-rw-r--r-- | src/com/isode/stroke/stringcodecs/PBKDF2.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/isode/stroke/stringcodecs/PBKDF2.java b/src/com/isode/stroke/stringcodecs/PBKDF2.java index 1392d2f..6147ee4 100644 --- a/src/com/isode/stroke/stringcodecs/PBKDF2.java +++ b/src/com/isode/stroke/stringcodecs/PBKDF2.java @@ -9,16 +9,18 @@ package com.isode.stroke.stringcodecs; import com.isode.stroke.base.ByteArray; +import com.isode.stroke.base.SafeByteArray; +import com.isode.stroke.crypto.CryptoProvider; public class PBKDF2 { - public static ByteArray encode(ByteArray password, ByteArray salt, int iterations) { - ByteArray u = HMACSHA1.getResult(password, ByteArray.plus(salt, new ByteArray("\0\0\0\1"))); + public static ByteArray encode(SafeByteArray password, ByteArray salt, int iterations, CryptoProvider crypto) { + ByteArray u = crypto.getHMACSHA1(password, ByteArray.plus(salt, new ByteArray("\0\0\0\1"))); ByteArray result = new ByteArray(u); byte[] resultData = result.getData(); int i = 1; while (i < iterations) { - u = HMACSHA1.getResult(password, u); + u = crypto.getHMACSHA1(password, u); for (int j = 0; j < u.getSize(); ++j) { resultData[j] ^= u.getData()[j]; } |