tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge changes Ic373e0a3,Icb3937d8 into main

Browse source 
* changes:
  Replace std::basic_string_view<uint8_t> with std::span
  Replace std::basic_string<uint8_t> with std::vector
This commit is contained in:
Ryan Prichard 2024-02-13 17:32:52 +00:00 committed by Gerrit Code Review
commit 600b93a0c2
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
keymaster/4.0/vts/functional/HmacKeySharingTest.cpp
View file

@ -51,7 +51,7 @@ class HmacKeySharingTest : public KeymasterHidlTest {
}; };
using KeymasterVec = std::vector<sp<IKeymasterDevice>>; using KeymasterVec = std::vector<sp<IKeymasterDevice>>;
using ByteString = std::basic_string<uint8_t>; using ByteString = std::vector<uint8_t>;
// using NonceVec = std::vector<HidlBuf>; // using NonceVec = std::vector<HidlBuf>;
GetParamsResult getHmacSharingParameters(IKeymasterDevice& keymaster) { GetParamsResult getHmacSharingParameters(IKeymasterDevice& keymaster) {
@ -98,7 +98,7 @@ class HmacKeySharingTest : public KeymasterHidlTest {
std::vector<ByteString> copyNonces(const hidl_vec<HmacSharingParameters>& paramsVec) { std::vector<ByteString> copyNonces(const hidl_vec<HmacSharingParameters>& paramsVec) {
std::vector<ByteString> nonces; std::vector<ByteString> nonces;
for (auto& param : paramsVec) { 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; return nonces;
} }

18
security/keymint/support/remote_prov_utils_test.cpp
View file

@ -14,20 +14,23 @@
* limitations under the License. * limitations under the License.
*/ */
#include "cppbor.h"
#include "keymaster/cppcose/cppcose.h"
#include <aidl/android/hardware/security/keymint/RpcHardwareInfo.h> #include <aidl/android/hardware/security/keymint/RpcHardwareInfo.h>
#include <android-base/properties.h> #include <android-base/properties.h>
#include <cppbor.h>
#include <cppbor_parse.h> #include <cppbor_parse.h>
#include <cstdint>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <keymaster/android_keymaster_utils.h> #include <keymaster/android_keymaster_utils.h>
#include <keymaster/cppcose/cppcose.h>
#include <keymaster/logger.h> #include <keymaster/logger.h>
#include <keymaster/remote_provisioning_utils.h> #include <keymaster/remote_provisioning_utils.h>
#include <openssl/curve25519.h> #include <openssl/curve25519.h>
#include <remote_prov/remote_prov_utils.h> #include <remote_prov/remote_prov_utils.h>
#include <algorithm>
#include <cstdint>
#include <span>
namespace aidl::android::hardware::security::keymint::remote_prov { namespace aidl::android::hardware::security::keymint::remote_prov {
namespace { namespace {
@ -36,7 +39,11 @@ using ::keymaster::kStatusFailed;
using ::keymaster::kStatusInvalidEek; using ::keymaster::kStatusInvalidEek;
using ::keymaster::StatusOr; using ::keymaster::StatusOr;
using ::testing::ElementsAreArray; 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 { struct KeyInfoEcdsa {
CoseKeyCurve curve; CoseKeyCurve curve;
@ -44,7 +51,8 @@ struct KeyInfoEcdsa {
byte_view pubKeyY; byte_view pubKeyY;
bool operator==(const KeyInfoEcdsa& other) const { 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);
} }
}; };