|
| 1 | +diff --git a/android/src/main/java/com/tectiv3/aes/RCTAes.java b/android/src/main/java/com/tectiv3/aes/RCTAes.java |
| 2 | +index 5871b6f0cc0b01754f2265e13e804c8b5ecc8c19..b07988fe3a72c5c0ecc8d15552259630b976458e 100755 |
| 3 | +--- a/android/src/main/java/com/tectiv3/aes/RCTAes.java |
| 4 | ++++ b/android/src/main/java/com/tectiv3/aes/RCTAes.java |
| 5 | +@@ -179,7 +179,7 @@ public class RCTAes extends ReactContextBaseJavaModule { |
| 6 | + throws NoSuchAlgorithmException, InvalidKeySpecException, UnsupportedEncodingException |
| 7 | + { |
| 8 | + PKCS5S2ParametersGenerator gen = new PKCS5S2ParametersGenerator(new SHA512Digest()); |
| 9 | +- gen.init(pwd.getBytes("UTF_8"), salt.getBytes("UTF_8"), cost); |
| 10 | ++ gen.init(pwd.getBytes("UTF_8"), Base64.decode(salt, Base64.NO_WRAP), cost); |
| 11 | + byte[] key = ((KeyParameter) gen.generateDerivedParameters(length)).getKey(); |
| 12 | + return bytesToHex(key); |
| 13 | + } |
| 14 | +diff --git a/ios/RCTAes/lib/AesCrypt.m b/ios/RCTAes/lib/AesCrypt.m |
| 15 | +index 4f20b49ee0c70e0858a442b5e0c733adc3fb8cfd..3cb594e3a75dea8999b226d6aa789f7528bd3ff7 100755 |
| 16 | +--- a/ios/RCTAes/lib/AesCrypt.m |
| 17 | ++++ b/ios/RCTAes/lib/AesCrypt.m |
| 18 | +@@ -38,8 +38,7 @@ |
| 19 | + + (NSString *) pbkdf2:(NSString *)password salt: (NSString *)salt cost: (NSInteger)cost length: (NSInteger)length { |
| 20 | + // Data of String to generate Hash key(hexa decimal string). |
| 21 | + NSData *passwordData = [password dataUsingEncoding:NSUTF8StringEncoding]; |
| 22 | +- NSData *saltData = [salt dataUsingEncoding:NSUTF8StringEncoding]; |
| 23 | +- |
| 24 | ++ NSData *saltData = [[NSData alloc] initWithBase64EncodedString:salt options:NSDataBase64DecodingIgnoreUnknownCharacters]; |
| 25 | + // Hash key (hexa decimal) string data length. |
| 26 | + NSMutableData *hashKeyData = [NSMutableData dataWithLength:length/8]; |
| 27 | + |
0 commit comments