Merge pull request #1 from helios175/securerandomfix

SecureRandomFix.createLocalSecureRandom
facebookarchive · Dec 6, 2016 · e6cefb1 · e6cefb1
2 parents c8a2841 + 2574354
commit e6cefb1
Show file tree

Hide file tree

Showing 5 changed files with 229 additions and 305 deletions.
diff --git a/instrumentTest/crypto/src/com/facebook/crypto/PasswordBasedKeyDerivationTest.java b/instrumentTest/crypto/src/com/facebook/crypto/PasswordBasedKeyDerivationTest.java
@@ -11,7 +11,6 @@
 package com.facebook.crypto;
 
 import com.facebook.android.crypto.keychain.AndroidConceal;
-import com.facebook.android.crypto.keychain.FixedSecureRandom;
 import com.facebook.crypto.keygen.PasswordBasedKeyDerivation;
 import com.facebook.crypto.util.SystemNativeCryptoLibrary;
 

diff --git a/java/com/facebook/android/crypto/keychain/AndroidConceal.java b/java/com/facebook/android/crypto/keychain/AndroidConceal.java
@@ -19,6 +19,6 @@ public static synchronized AndroidConceal get() {
     }
 
     private AndroidConceal() {
-        super(new SystemNativeCryptoLibrary(), new FixedSecureRandom());
+        super(new SystemNativeCryptoLibrary(), SecureRandomFix.createLocalSecureRandom());
     }
 }
diff --git a/java/com/facebook/android/crypto/keychain/FixedSecureRandom.java b/java/com/facebook/android/crypto/keychain/FixedSecureRandom.java