Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make AttestedKeyPair constructable

Browse Source 
Make the constructor for AttestedKeyPair public so instances of it can
be created for testing.

Bug: 138409426
Test: That it compiles
Change-Id: Iab8fbf1ad2293a91347701eb67631a8f3a3bd3fa
This commit is contained in:
Eran Messeri
2019-08-05 17:38:55 +01:00
parent 8c0df67fa4
commit 390539d11b
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
api/current.txt
View File

@@ -40628,8 +40628,9 @@ package android.se.omapi {
package android.security {
public final class AttestedKeyPair {
method public java.util.List<java.security.cert.Certificate> getAttestationRecord();
method public java.security.KeyPair getKeyPair();
ctor public AttestedKeyPair(@Nullable java.security.KeyPair, @Nullable java.security.cert.Certificate[]);
method @NonNull public java.util.List<java.security.cert.Certificate> getAttestationRecord();
method @Nullable public java.security.KeyPair getKeyPair();
}
public class ConfirmationAlreadyPresentingException extends java.lang.Exception {

14
keystore/java/android/security/AttestedKeyPair.java
View File

@@ -16,6 +16,9 @@
package android.security;
import android.annotation.NonNull;
import android.annotation.Nullable;
import java.security.KeyPair;
import java.security.cert.Certificate;
import java.util.ArrayList;
@@ -36,9 +39,12 @@ public final class AttestedKeyPair {
private final Certificate[] mAttestationRecord;
/**
* @hide Only created by the platform, no need to expose as public API.
* Public constructor for creating a new instance (useful for testing).
*
* @param keyPair the key pair associated with the attestation record.
* @param attestationRecord attestation record for the provided key pair.
*/
public AttestedKeyPair(KeyPair keyPair, Certificate[] attestationRecord) {
public AttestedKeyPair(@Nullable KeyPair keyPair, @Nullable Certificate[] attestationRecord) {
mKeyPair = keyPair;
mAttestationRecord = attestationRecord;
}
@@ -47,7 +53,7 @@ public final class AttestedKeyPair {
* Returns the generated key pair associated with the attestation record
* in this instance.
*/
public KeyPair getKeyPair() {
public @Nullable KeyPair getKeyPair() {
return mKeyPair;
}
@@ -66,7 +72,7 @@ public final class AttestedKeyPair {
* and <a href="https://developer.android.com/training/articles/security-key-attestation.html">
* Key Attestation</a> for the format of the attestation record inside the certificate.
*/
public List<Certificate> getAttestationRecord() {
public @NonNull List<Certificate> getAttestationRecord() {
if (mAttestationRecord == null) {
return new ArrayList();
}