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

Commit 7f07d013 authored by Janis Danisevskis's avatar Janis Danisevskis Committed by Automerger Merge Worker
Browse files

Fix Keymint VTS test after adding CERTIFICATE_* tags am: 164bb878 am: 68f64d5b 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I30a6963e176405dad80b37b1f939c54be30884a3
parents d0f6673a 68f64d5b

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

+155 −84

File changed.

Preview size limit exceeded, changes collapsed.

security/keymint/support/authorization_set.cpp

+8 −0
Original line number Diff line number Diff line
@@ -243,4 +243,12 @@ AuthorizationSetBuilder& AuthorizationSetBuilder::Padding( 
    return *this;

}



AuthorizationSetBuilder& AuthorizationSetBuilder::SetDefaultValidity() {

    // Per RFC 5280 4.1.2.5, an undefined expiration (not-after) field should be set to

    // GeneralizedTime 999912312359559, which is 253402300799000 ms from Jan 1, 1970.

    constexpr uint64_t kUndefinedExpirationDateTime = 253402300799000;

    Authorization(TAG_CERTIFICATE_NOT_BEFORE, 0);

    return Authorization(TAG_CERTIFICATE_NOT_AFTER, kUndefinedExpirationDateTime);

}



}  // namespace aidl::android::hardware::security::keymint

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

+2 −0
Original line number Diff line number Diff line
@@ -300,6 +300,8 @@ class AuthorizationSetBuilder : public AuthorizationSet { 
    AuthorizationSetBuilder& Digest(std::vector<Digest> digests);

    AuthorizationSetBuilder& Padding(std::initializer_list<PaddingMode> paddings);



    AuthorizationSetBuilder& SetDefaultValidity();



    AuthorizationSetBuilder& AttestationChallenge(const std::string& challenge) {

        return Authorization(TAG_ATTESTATION_CHALLENGE, challenge);

    }