Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e3027ab authored by David Drysdale's avatar David Drysdale Committed by Automerger Merge Worker
Browse files

Merge "Specify KeyMint EC keys by curve not size" am: 153bbc9c 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1857515

Change-Id: If9f70170cf065013e39a1439ff1f5b85715f4dac
parents 8fe0dacf 153bbc9c

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ TEST_P(GenerateKeyTests, generateAndUseEcdsaP256Key_prodMode) { 
    // Generate an ECDSA key that is attested by the generated P256 keypair.

    AuthorizationSet keyDesc = AuthorizationSetBuilder()

                                       .Authorization(TAG_NO_AUTH_REQUIRED)

                                       .EcdsaSigningKey(256)

                                       .EcdsaSigningKey(EcCurve::P_256)

                                       .AttestationChallenge("foo")

                                       .AttestationApplicationId("bar")

                                       .Digest(Digest::NONE)

security/keymint/support/authorization_set.cpp

+0 −5
Original line number Diff line number Diff line
@@ -161,11 +161,6 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::RsaEncryptionKey(uint32_t key_ 
    return EncryptionKey();

}



AuthorizationSetBuilder& AuthorizationSetBuilder::EcdsaSigningKey(uint32_t key_size) {

    EcdsaKey(key_size);

    return SigningKey();

}



AuthorizationSetBuilder& AuthorizationSetBuilder::EcdsaSigningKey(EcCurve curve) {

    EcdsaKey(curve);

    return SigningKey();

security/keymint/support/include/keymint_support/authorization_set.h

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ class AuthorizationSetBuilder : public AuthorizationSet { 


    AuthorizationSetBuilder& RsaSigningKey(uint32_t key_size, uint64_t public_exponent);

    AuthorizationSetBuilder& RsaEncryptionKey(uint32_t key_size, uint64_t public_exponent);

    AuthorizationSetBuilder& EcdsaSigningKey(uint32_t key_size);

    AuthorizationSetBuilder& EcdsaSigningKey(EcCurve curve);

    AuthorizationSetBuilder& AesEncryptionKey(uint32_t key_size);

    AuthorizationSetBuilder& TripleDesEncryptionKey(uint32_t key_size);