Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Use StrongBox on API 28+ if available.

Browse Source
This commit is contained in:
akwizgran
2020-01-09 15:18:58 +00:00
parent fc6b596241
commit f76d08c19a
3 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
briar-android/src/main/java/org/briarproject/briar/android/AndroidKeyStoreConfig.java
View File

@@ -6,21 +6,37 @@ import org.briarproject.bramble.api.crypto.KeyStoreConfig;
import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
import java.security.spec.AlgorithmParameterSpec;
import java.util.List;
import androidx.annotation.RequiresApi;
import static android.os.Build.VERSION.SDK_INT;
import static android.security.keystore.KeyProperties.PURPOSE_SIGN;
import static java.util.Arrays.asList;
import static java.util.Collections.singletonList;
@RequiresApi(23)
@NotNullByDefault
class AndroidKeyStoreConfig implements KeyStoreConfig {
private final KeyGenParameterSpec spec;
private final List<AlgorithmParameterSpec> specs;
AndroidKeyStoreConfig() {
spec = new KeyGenParameterSpec.Builder("db", PURPOSE_SIGN)
.setKeySize(256)
.build();
KeyGenParameterSpec noStrongBox =
new KeyGenParameterSpec.Builder("db", PURPOSE_SIGN)
.setKeySize(256)
.build();
if (SDK_INT >= 28) {
// Prefer StrongBox if available
KeyGenParameterSpec strongBox =
new KeyGenParameterSpec.Builder("db", PURPOSE_SIGN)
.setIsStrongBoxBacked(true)
.setKeySize(256)
.build();
specs = asList(strongBox, noStrongBox);
} else {
specs = singletonList(noStrongBox);
}
}
@Override
@@ -44,7 +60,7 @@ class AndroidKeyStoreConfig implements KeyStoreConfig {
}
@Override
public AlgorithmParameterSpec getParameterSpec() {
return spec;
public List<AlgorithmParameterSpec> getParameterSpecs() {
return specs;
}
}