Skip to content

Fix RSA key attestation #5

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

Merged
VisionR1 merged 1 commit into from
Oct 28, 2025
Merged

Fix RSA key attestation #5

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
2 changes: 1 addition & 1 deletion app/src/main/java/io/github/vvb2060/keyattestation/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HomeViewModel(
}
}

private val attestationRepository = AttestationRepository(KeyStoreKeyType.ECDSA)
private val attestationRepository = AttestationRepository()
private val attestationData = MutableLiveData<Resource<BaseData>>()

var secretMode = sp.getBoolean("secret_mode", true)
Expand Down
19 changes: 7 additions & 12 deletions app/src/main/java/io/github/vvb2060/keyattestation/keystore/AndroidKeyStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import java.security.spec.ECGenParameterSpec;
import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Objects;

import javax.security.auth.x500.X500Principal;
Expand All @@ -47,27 +48,19 @@

public class AndroidKeyStore extends IAndroidKeyStore.Stub {
private final KeyStore keyStore;
private final KeyPairGenerator keyPairGenerator;
private final HashMap<Byte,KeyPairGenerator> keyPairGenerators = new HashMap<>();
private int clientUid = -1;

public AndroidKeyStore(byte keyStoreKeyType) throws Exception {
public AndroidKeyStore() throws Exception {
if (Os.geteuid() < Process.FIRST_APPLICATION_UID) {
fixEnv();
var pm = ActivityThread.currentApplication().getPackageManager();
clientUid = pm.getApplicationInfo(BuildConfig.APPLICATION_ID, 0).uid;
}
keyStore = KeyStore.getInstance("AndroidKeyStore");
keyStore.load(null);
keyPairGenerator = switch (keyStoreKeyType){
case KeyStoreKeyType.ECDSA ->
KeyPairGenerator.getInstance(
KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore");
case KeyStoreKeyType.RSA ->
KeyPairGenerator.getInstance(
KeyProperties.KEY_ALGORITHM_RSA, "AndroidKeyStore");
default ->
throw new IllegalStateException("Unimplemented KeyStore type: " + keyStoreKeyType);
};
keyPairGenerators.put(KeyStoreKeyType.ECDSA, KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_EC, "AndroidKeyStore"));
keyPairGenerators.put(KeyStoreKeyType.RSA, KeyPairGenerator.getInstance(KeyProperties.KEY_ALGORITHM_RSA, "AndroidKeyStore"));
}

private static void fixEnv() throws Exception {
Expand Down Expand Up @@ -279,6 +272,8 @@ public byte[] generateKeyPair(String alias,
var params = (KeyGenParameterSpec) genParameter(alias, attestKeyAlias, useStrongBox,
includeProps, uniqueIdIncluded, keyStoreKeyType, flagsToArray(idFlags));
try {
var keyPairGenerator = keyPairGenerators.get(keyStoreKeyType);
assert keyPairGenerator != null;
keyPairGenerator.initialize(params);
keyPairGenerator.generateKeyPair();
if (useSak) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/io/github/vvb2060/keyattestation/repository/AttestationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class AttestationRepository {
private final List<X509Certificate> currentCerts;
private IAndroidKeyStore keyStore;

public AttestationRepository(byte keyStoreKeyType) throws Exception {
localKeyStore = new AndroidKeyStore(keyStoreKeyType);
public AttestationRepository() throws Exception {
localKeyStore = new AndroidKeyStore();
factory = CertificateFactory.getInstance("X.509");
currentCerts = new ArrayList<>();
keyStore = localKeyStore;
Expand Down