Use std::move to avoid unnecessary copying
Test: m
Change-Id: I28160db16368d592ac5ffdffc443029ffc6493c2
diff --git a/keystore/keystore_cli_v2.cpp b/keystore/keystore_cli_v2.cpp
index 95fc491..dac0120 100644
--- a/keystore/keystore_cli_v2.cpp
+++ b/keystore/keystore_cli_v2.cpp
@@ -124,7 +124,7 @@
.Digest(Digest::SHA_2_384)
.Digest(Digest::SHA_2_512);
}
- return parameters;
+ return std::move(parameters);
}
AuthorizationSet GetRSAEncryptParameters(uint32_t key_size) {
@@ -133,7 +133,7 @@
.Padding(PaddingMode::RSA_PKCS1_1_5_ENCRYPT)
.Padding(PaddingMode::RSA_OAEP)
.Authorization(TAG_NO_AUTH_REQUIRED);
- return parameters;
+ return std::move(parameters);
}
AuthorizationSet GetECDSAParameters(uint32_t key_size, bool sha256_only) {
@@ -146,7 +146,7 @@
.Digest(Digest::SHA_2_384)
.Digest(Digest::SHA_2_512);
}
- return parameters;
+ return std::move(parameters);
}
AuthorizationSet GetAESParameters(uint32_t key_size, bool with_gcm_mode) {
@@ -161,7 +161,7 @@
parameters.Authorization(TAG_BLOCK_MODE, BlockMode::CTR);
parameters.Padding(PaddingMode::NONE);
}
- return parameters;
+ return std::move(parameters);
}
AuthorizationSet GetHMACParameters(uint32_t key_size, Digest digest) {
@@ -170,7 +170,7 @@
.Digest(digest)
.Authorization(TAG_MIN_MAC_LENGTH, 224)
.Authorization(TAG_NO_AUTH_REQUIRED);
- return parameters;
+ return std::move(parameters);
}
std::vector<TestCase> GetTestCases() {