Add support for KM_TAG_MIN_MAC_LENGTH.

HMAC and AES-GCM keys must be bound to a mininum MAC/tag length at
creation, and operations may not specify a length smaller than the
minimum, or provide a length smaller than the minimum during
verification.

Bug: 22337277
Change-Id: Id5ae2f4259045ba1418c28e9de8f4a47e67fd433

1 files changed, 2 insertions, 2 deletions

diff --git a/android_keymaster_test_utils.h b/android_keymaster_test_utils.h
index c32460e..3d9e26a 100644
--- a/android_keymaster_test_utils.h
+++ b/android_keymaster_test_utils.h
@@ -221,13 +221,13 @@ class Keymaster1Test : public testing::TestWithParam<InstanceCreatorPtr> {
     void SignMessage(const std::string& message, std::string* signature, keymaster_digest_t digest);
     void SignMessage(const std::string& message, std::string* signature, keymaster_digest_t digest,
                      keymaster_padding_t padding);
-    void MacMessage(const std::string& message, std::string* signature, keymaster_digest_t digest,
-                    size_t mac_length);
+    void MacMessage(const std::string& message, std::string* signature, size_t mac_length);
 
     void VerifyMessage(const std::string& message, const std::string& signature,
                        keymaster_digest_t digest);
     void VerifyMessage(const std::string& message, const std::string& signature,
                        keymaster_digest_t digest, keymaster_padding_t padding);
+    void VerifyMac(const std::string& message, const std::string& signature);
 
     std::string EncryptMessage(const std::string& message, keymaster_padding_t padding,
                                std::string* generated_nonce = NULL);