summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Moore <sethmo@google.com>2022-02-09 17:34:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-09 17:34:20 +0000
commit8d1c353ef851cf5040f09b67e59a5f1f80ef5c41 (patch)
treecac41f16fc4fdd0c7dccf61b1bf665274c89811f
parente2b6ab4de079b6521d33c3503b0c3c33c9b64f92 (diff)
parent3979e68e6f37f2decdbc1c67c8cb86f414248c5f (diff)
downloadkeymaster-8d1c353ef851cf5040f09b67e59a5f1f80ef5c41.tar.gz
Stop copying macFunction in RPK utilities am: 3979e68e6f
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1976867 Change-Id: Iad18293e4b98a01b5b133b19bc8ee9c5bab7cb04
-rw-r--r--android_keymaster/remote_provisioning_utils.cpp2
-rw-r--r--include/keymaster/remote_provisioning_utils.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/android_keymaster/remote_provisioning_utils.cpp b/android_keymaster/remote_provisioning_utils.cpp
index 8cb635b..78a058a 100644
--- a/android_keymaster/remote_provisioning_utils.cpp
+++ b/android_keymaster/remote_provisioning_utils.cpp
@@ -126,7 +126,7 @@ validateAndExtractEekPubAndId(bool testMode, const KeymasterBlob& endpointEncryp
StatusOr<std::vector<uint8_t> /* pubkeys */>
validateAndExtractPubkeys(bool testMode, uint32_t numKeys, KeymasterBlob* keysToSign,
- cppcose::HmacSha256Function macFunction) {
+ const cppcose::HmacSha256Function& macFunction) {
auto pubKeysToMac = cppbor::Array();
for (size_t i = 0; i < numKeys; i++) {
auto [macedKeyItem, _, coseMacErrMsg] =
diff --git a/include/keymaster/remote_provisioning_utils.h b/include/keymaster/remote_provisioning_utils.h
index 7c38a76..76acdc7 100644
--- a/include/keymaster/remote_provisioning_utils.h
+++ b/include/keymaster/remote_provisioning_utils.h
@@ -70,7 +70,7 @@ validateAndExtractEekPubAndId(bool testMode, const KeymasterBlob& endpointEncryp
StatusOr<std::vector<uint8_t> /* pubkeys */>
validateAndExtractPubkeys(bool testMode, uint32_t numKeys, KeymasterBlob* keysToSign,
- cppcose::HmacSha256Function macFunction);
+ const cppcose::HmacSha256Function& macFunction);
cppbor::Array buildCertReqRecipients(const std::vector<uint8_t>& pubkey,
const std::vector<uint8_t>& kid);