diff options
| author | Shawn Willden <swillden@google.com> | 2015-06-17 06:39:48 -0600 |
|---|---|---|
| committer | Shawn Willden <swillden@google.com> | 2015-06-17 09:27:04 -0600 |
| commit | 36d41e230417ac3b86a1425ebf60fff6d92377ec (patch) | |
| tree | 281335540ec29aad429e077228f548b72769a43b /integrity_assured_key_blob.cpp | |
| parent | 34419130408d2a6dcadd7b0f1b6d2c9c4002bbac (diff) | |
| download | android_system_keymaster-36d41e230417ac3b86a1425ebf60fff6d92377ec.tar.gz android_system_keymaster-36d41e230417ac3b86a1425ebf60fff6d92377ec.tar.bz2 android_system_keymaster-36d41e230417ac3b86a1425ebf60fff6d92377ec.zip | |
Refactor AndroidKeymaster so all methods use message objects.
Methods with simple argument or return types eschewed message objects,
but this complicates the TrustyKeymaster implementation by requiring it
to build its own system for marshalling and unmarshalling.
Bug: 14674558
Change-Id: I5a88523c9d1a76c8629ff6f93040ceb3c2a9426b
Diffstat (limited to 'integrity_assured_key_blob.cpp')
| -rw-r--r-- | integrity_assured_key_blob.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/integrity_assured_key_blob.cpp b/integrity_assured_key_blob.cpp index 1376cff..9ae349d 100644 --- a/integrity_assured_key_blob.cpp +++ b/integrity_assured_key_blob.cpp @@ -47,7 +47,7 @@ class HmacCleanup { HMAC_CTX* ctx_; }; -keymaster_error_t ComputeHmac(const uint8_t* serialized_data, size_t serialized_data_size, +static keymaster_error_t ComputeHmac(const uint8_t* serialized_data, size_t serialized_data_size, const AuthorizationSet& hidden, uint8_t hmac[HMAC_SIZE]) { size_t hidden_bytes_size = hidden.SerializedSize(); UniquePtr<uint8_t[]> hidden_bytes(new uint8_t[hidden_bytes_size]); |