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

Commit 8009b3cc authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "C++17 compatibility: add a non-const char* overload." am: f919d0a0 am: 9ef0004a 

am: 6464114f

Change-Id: If291303fec3c252f90a119431c6124d81ec46b2d
parents a7e85796 6464114f

keymaster/3.0/vts/functional/authorization_set.h

+6 −0
Original line number Diff line number Diff line
@@ -261,6 +261,12 @@ class AuthorizationSetBuilder : public AuthorizationSet { 
        return Authorization(ttag, reinterpret_cast<const uint8_t*>(data), data_length);

    }



    template <Tag tag>

    AuthorizationSetBuilder& Authorization(TypedTag<TagType::BYTES, tag> ttag, char* data,

                                           size_t data_length) {

        return Authorization(ttag, reinterpret_cast<const uint8_t*>(data), data_length);

    }



    AuthorizationSetBuilder& Authorizations(AuthorizationSet&& set);

    AuthorizationSetBuilder& Authorizations(const AuthorizationSet& set);

keymaster/4.0/support/include/keymasterV4_0/authorization_set.h

+6 −0
Original line number Diff line number Diff line
@@ -251,6 +251,12 @@ class AuthorizationSetBuilder : public AuthorizationSet { 
        return Authorization(ttag, reinterpret_cast<const uint8_t*>(data), data_length);

    }



    template <Tag tag>

    AuthorizationSetBuilder& Authorization(TypedTag<TagType::BYTES, tag> ttag, char* data,

                                           size_t data_length) {

        return Authorization(ttag, reinterpret_cast<const uint8_t*>(data), data_length);

    }



    AuthorizationSetBuilder& Authorizations(const AuthorizationSet& set) {

        for (const auto& entry : set) {

            push_back(entry);