Skip to content

Fix: Handle Keystore exceptions on iMin devices #975

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix: Handle Keystore exceptions on iMin devices #975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 31 additions & 2 deletions ...re_storage/android/src/main/java/com/it_nomads/fluttersecurestorage/crypto/MasterKey.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,37 @@ static MasterKey build(Builder builder) throws GeneralSecurityException, IOExcep
throw new NullPointerException(
"KeyGenParameterSpec was null after build() check");
}
String keyAlias = MasterKeys.getOrCreate(builder.mKeyGenParameterSpec);
return new MasterKey(keyAlias, builder.mKeyGenParameterSpec);
try {
String keyAlias = MasterKeys.getOrCreate(builder.mKeyGenParameterSpec);
return new MasterKey(keyAlias, builder.mKeyGenParameterSpec);
} catch (GeneralSecurityException e) {
if (builder.mKeyGenParameterSpec.getKeySize() == 256) {
try {
KeyGenParameterSpec.Builder newSpecBuilder = new KeyGenParameterSpec.Builder(
builder.mKeyGenParameterSpec.getKeystoreAlias(),
builder.mKeyGenParameterSpec.getPurposes())
.setBlockModes(builder.mKeyGenParameterSpec.getBlockModes())
.setEncryptionPaddings(builder.mKeyGenParameterSpec.getEncryptionPaddings())
.setKeySize(128);
if (builder.mKeyGenParameterSpec.isUserAuthenticationRequired()) {
newSpecBuilder.setUserAuthenticationRequired(true);
newSpecBuilder.setUserAuthenticationValidityDurationSeconds(
builder.mKeyGenParameterSpec.getUserAuthenticationValidityDurationSeconds());
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
if (Api28Impl.isStrongBoxBacked(builder.mKeyGenParameterSpec)) {
Api28Impl.setIsStrongBoxBacked(newSpecBuilder);
}
}
builder.mKeyGenParameterSpec = newSpecBuilder.build();
String keyAlias = MasterKeys.getOrCreate(builder.mKeyGenParameterSpec);
return new MasterKey(keyAlias, builder.mKeyGenParameterSpec);
} catch (Exception fallbackException) {
throw e;
}
}
throw e;
}
}
@RequiresApi(28)
static class Api28Impl {
Expand Down
4 changes: 2 additions & 2 deletions ...e_storage/android/src/main/java/com/it_nomads/fluttersecurestorage/crypto/MasterKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ public static String getOrCreate(
}
@VisibleForTesting
static void validate(KeyGenParameterSpec spec) {
if (spec.getKeySize() != KEY_SIZE) {
if (spec.getKeySize() != 256 && spec.getKeySize() != 128) {
throw new IllegalArgumentException(
"invalid key size, want " + KEY_SIZE + " bits got " + spec.getKeySize()
"invalid key size, want 256 or 128 bits got " + spec.getKeySize()
+ " bits");
}
if (!Arrays.equals(spec.getBlockModes(), new String[]{KeyProperties.BLOCK_MODE_GCM})) {
Expand Down