Add Migrate Function For KeystoreIdentityCredential #346
Conversation
suzannajiwani
force-pushed
the
issue-331
branch
from
2d6ad27 to
ff7da86
Compare
|
This needs to be rebased on master branch for the |
suzannajiwani
force-pushed
the
issue-331
branch
3 times, most recently
from
af23ea3 to
3c6da26
Compare
...android/src/main/java/com/android/identity/android/securearea/AndroidKeystoreSecureArea.java
Show resolved
Hide resolved
| * @param existingKeyAlias the alias of the existing key. | ||
| * @return A newly created credential. | ||
| */ | ||
| public @NonNull Credential createCredentialWithExistingKey( |
| */ | ||
| public @NonNull Credential createCredentialWithExistingKey( | ||
| @NonNull String name, | ||
| @NonNull SecureArea.CreateKeySettings credentialKeySettings, |
There was a problem hiding this comment.
Why do we take a CreateKeySettings object here? I mean, the key already exists so...
There was a problem hiding this comment.
My reasoning is that I wanted CredentialStore#createCredentialWithExistingKey to be generic enough to support all keys, not just from KeystoreIdentityCredential#migrateToCredentialStore (since the keys being migrated have CreateKeySettings with only EC_CURVE_P256, no biometric authentication, and no attest key).
On that note, though, if being generic isn't needed/wanted here, I could rename the function (to be clear it's only for migration) and make the CreateKeySettings further down the call path before it gets to SecureArea#createKey(alias, createKeySettings)
suzannajiwani
force-pushed
the
issue-331
branch
from
3c6da26 to
58c2052
Compare
|
The unit tests don't like the way the |
Added a function to the KeystoreIdentityCredential class that creates a new Credential (identity/src/main/java/com/android/identity/credential/Credential.java) using the information in the given KeystoreIdentityCredential and deletes the KeystoreIdentityCredential once the new Credential is created. This change required additional functions in the Credential, CredentialStore, and AndroidKeystore classes which allow Credential creation with an existing key so the credential key from the KeystoreIdentityCredential could be preserved. A function in Utility.java to extract key settings from an existing key as well as a function in CredentialData.java to delete credential information while preserving the key were also added to aid in this process. Tested in MigrateFromKeystoreICStoreTest.
suzannajiwani
force-pushed
the
issue-331
branch
from
58c2052 to
ba341af
Compare
suzannajiwani
merged commit f8b3596
into
openwallet-foundation-labs:master
Added a function to the KeystoreIdentityCredential class that creates a new Credential (identity/src/main/java/com/android/identity/credential/Credential.java) using the information in the given KeystoreIdentityCredential and deletes the KeystoreIdentityCredential once the new Credential is created. This change required additional functions in the Credential, CredentialStore, and AndroidKeystore classes which allow Credential creation with an existing key so the credential key from the KeystoreIdentityCredential could be preserved. A function in Utility.java to extract key settings from an existing key as well as a function in CredentialData.java to delete credential information while preserving the key were also added to aid in this process.
Tested in MigrateFromKeystoreICStoreTest.
Fixes #331