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

Commit 600b93a0 authored by Ryan Prichard's avatar Ryan Prichard Committed by Gerrit Code Review
Browse files

Merge changes Ic373e0a3,Icb3937d8 into main 

* changes:
  Replace std::basic_string_view<uint8_t> with std::span
  Replace std::basic_string<uint8_t> with std::vector
parents ac270bcb 01cf20d7

keymaster/4.0/vts/functional/HmacKeySharingTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class HmacKeySharingTest : public KeymasterHidlTest { 
    };



    using KeymasterVec = std::vector<sp<IKeymasterDevice>>;

    using ByteString = std::basic_string<uint8_t>;

    using ByteString = std::vector<uint8_t>;

    // using NonceVec = std::vector<HidlBuf>;



    GetParamsResult getHmacSharingParameters(IKeymasterDevice& keymaster) {
@@ -98,7 +98,7 @@ class HmacKeySharingTest : public KeymasterHidlTest { 
    std::vector<ByteString> copyNonces(const hidl_vec<HmacSharingParameters>& paramsVec) {

        std::vector<ByteString> nonces;

        for (auto& param : paramsVec) {

            nonces.emplace_back(param.nonce.data(), param.nonce.size());

            nonces.emplace_back(param.nonce.data(), param.nonce.data() + param.nonce.size());

        }

        return nonces;

    }

security/keymint/support/remote_prov_utils_test.cpp

+13 −5
Original line number Diff line number Diff line
@@ -14,20 +14,23 @@ 
 * limitations under the License.

 */



#include "cppbor.h"

#include "keymaster/cppcose/cppcose.h"

#include <aidl/android/hardware/security/keymint/RpcHardwareInfo.h>

#include <android-base/properties.h>

#include <cppbor.h>

#include <cppbor_parse.h>

#include <cstdint>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <keymaster/android_keymaster_utils.h>

#include <keymaster/cppcose/cppcose.h>

#include <keymaster/logger.h>

#include <keymaster/remote_provisioning_utils.h>

#include <openssl/curve25519.h>

#include <remote_prov/remote_prov_utils.h>



#include <algorithm>

#include <cstdint>

#include <span>



namespace aidl::android::hardware::security::keymint::remote_prov {

namespace {
@@ -36,7 +39,11 @@ using ::keymaster::kStatusFailed; 
using ::keymaster::kStatusInvalidEek;

using ::keymaster::StatusOr;

using ::testing::ElementsAreArray;

using byte_view = std::basic_string_view<uint8_t>;

using byte_view = std::span<const uint8_t>;



inline bool equal_byte_views(const byte_view& view1, const byte_view& view2) {

    return std::equal(view1.begin(), view1.end(), view2.begin(), view2.end());

}



struct KeyInfoEcdsa {

    CoseKeyCurve curve;
@@ -44,7 +51,8 @@ struct KeyInfoEcdsa { 
    byte_view pubKeyY;



    bool operator==(const KeyInfoEcdsa& other) const {

        return curve == other.curve && pubKeyX == other.pubKeyX && pubKeyY == other.pubKeyY;

        return curve == other.curve && equal_byte_views(pubKeyX, other.pubKeyX) &&

               equal_byte_views(pubKeyY, other.pubKeyY);

    }

};