status-im
/
react-native-keychain
mirror of https://github.com/status-im/react-native-keychain.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

extract a function, add null checks (#146) 

* extract a function, add null checks

* rename function
This commit is contained in:
Vojtech Novak 2018-09-04 13:55:37 +02:00 committed by GitHub
parent 575cd8c06a
commit 1abc167b70
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
android/src/main/java/com/oblador/keychain/DeviceAvailability.java
View File

@ -10,15 +10,15 @@ public class DeviceAvailability {
if (android.os.Build.VERSION.SDK_INT >= 23) { if (android.os.Build.VERSION.SDK_INT >= 23) {
FingerprintManager fingerprintManager = FingerprintManager fingerprintManager =
(FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE); (FingerprintManager) context.getSystemService(Context.FINGERPRINT_SERVICE);
return fingerprintManager.isHardwareDetected() && return fingerprintManager != null && fingerprintManager.isHardwareDetected() &&
fingerprintManager.hasEnrolledFingerprints(); fingerprintManager.hasEnrolledFingerprints();
} }
return false; return false;
} }
public static boolean isSecure(Context context) { public static boolean isDeviceSecure(Context context) {
KeyguardManager keyguardManager = KeyguardManager keyguardManager =
(KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE); (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
return android.os.Build.VERSION.SDK_INT >= 23 && keyguardManager.isDeviceSecure(); return Build.VERSION.SDK_INT >= 23 && keyguardManager != null && keyguardManager.isDeviceSecure();
} }
} }

35
android/src/main/java/com/oblador/keychain/cipherStorage/CipherStorageKeystoreAESCBC.java
View File

@ -29,6 +29,7 @@ import javax.crypto.CipherOutputStream;
import javax.crypto.KeyGenerator; import javax.crypto.KeyGenerator;
import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.IvParameterSpec;
@TargetApi(Build.VERSION_CODES.M)
public class CipherStorageKeystoreAESCBC implements CipherStorage { public class CipherStorageKeystoreAESCBC implements CipherStorage {
public static final String CIPHER_STORAGE_NAME = "KeystoreAESCBC"; public static final String CIPHER_STORAGE_NAME = "KeystoreAESCBC";
public static final String DEFAULT_SERVICE = "RN_KEYCHAIN_DEFAULT_ALIAS"; public static final String DEFAULT_SERVICE = "RN_KEYCHAIN_DEFAULT_ALIAS";
@ -52,7 +53,6 @@ public class CipherStorageKeystoreAESCBC implements CipherStorage {
return Build.VERSION_CODES.M; return Build.VERSION_CODES.M;
} }
@TargetApi(Build.VERSION_CODES.M)
@Override @Override
public EncryptionResult encrypt(@NonNull String service, @NonNull String username, @NonNull String password) throws CryptoFailedException { public EncryptionResult encrypt(@NonNull String service, @NonNull String username, @NonNull String password) throws CryptoFailedException {
service = getDefaultServiceIfEmpty(service); service = getDefaultServiceIfEmpty(service);
@ -61,21 +61,7 @@ public class CipherStorageKeystoreAESCBC implements CipherStorage {
KeyStore keyStore = getKeyStoreAndLoad(); KeyStore keyStore = getKeyStoreAndLoad();
if (!keyStore.containsAlias(service)) { if (!keyStore.containsAlias(service)) {
AlgorithmParameterSpec spec; generateKeyAndStoreUnderAlias(service);
spec = new KeyGenParameterSpec.Builder(
service,
KeyProperties.PURPOSE_DECRYPT | KeyProperties.PURPOSE_ENCRYPT)
.setBlockModes(ENCRYPTION_BLOCK_MODE)
.setEncryptionPaddings(ENCRYPTION_PADDING)
.setRandomizedEncryptionRequired(true)
//.setUserAuthenticationRequired(true) // Will throw InvalidAlgorithmParameterException if there is no fingerprint enrolled on the device
.setKeySize(ENCRYPTION_KEY_SIZE)
.build();
KeyGenerator generator = KeyGenerator.getInstance(ENCRYPTION_ALGORITHM, KEYSTORE_TYPE);
generator.init(spec);
generator.generateKey();
} }
Key key = keyStore.getKey(service, null); Key key = keyStore.getKey(service, null);
@ -93,6 +79,23 @@ public class CipherStorageKeystoreAESCBC implements CipherStorage {
} }
} }
private void generateKeyAndStoreUnderAlias(@NonNull String service) throws NoSuchAlgorithmException, NoSuchProviderException, InvalidAlgorithmParameterException {
AlgorithmParameterSpec spec = new KeyGenParameterSpec.Builder(
service,
KeyProperties.PURPOSE_DECRYPT | KeyProperties.PURPOSE_ENCRYPT)
.setBlockModes(ENCRYPTION_BLOCK_MODE)
.setEncryptionPaddings(ENCRYPTION_PADDING)
.setRandomizedEncryptionRequired(true)
//.setUserAuthenticationRequired(true) // Will throw InvalidAlgorithmParameterException if there is no fingerprint enrolled on the device
.setKeySize(ENCRYPTION_KEY_SIZE)
.build();
KeyGenerator generator = KeyGenerator.getInstance(ENCRYPTION_ALGORITHM, KEYSTORE_TYPE);
generator.init(spec);
generator.generateKey();
}
@Override @Override
public DecryptionResult decrypt(@NonNull String service, @NonNull byte[] username, @NonNull byte[] password) throws CryptoFailedException { public DecryptionResult decrypt(@NonNull String service, @NonNull byte[] username, @NonNull byte[] password) throws CryptoFailedException {
service = getDefaultServiceIfEmpty(service); service = getDefaultServiceIfEmpty(service);