Snap for 4832339 from 1404f1630542ba9a26e669bb3eea4da50b2e4654 to pi-release
Change-Id: I32072f88654517b0370cea0e790f6edee78b59dd
diff --git a/src/blob.h b/src/blob.h
index 4a88b45..f6d11fe 100644
--- a/src/blob.h
+++ b/src/blob.h
@@ -45,7 +45,7 @@
struct blob_sym {
uint32_t key_bits;
- uint8_t bytes[512 >> 3];
+ uint8_t bytes[2048 >> 3];
} __attribute__((packed));
enum blob_alg {
diff --git a/src/keymaster-import-wrapped-key-tests.cc b/src/keymaster-import-wrapped-key-tests.cc
index 832a5c8..0354b8b 100644
--- a/src/keymaster-import-wrapped-key-tests.cc
+++ b/src/keymaster-import-wrapped-key-tests.cc
@@ -15,6 +15,7 @@
#include "openssl/bn.h"
#include "openssl/ec_key.h"
#include "openssl/nid.h"
+#include "openssl/sha.h"
using std::cout;
using std::string;
@@ -220,6 +221,9 @@
blob.b.tee_enforced.params[1].tag = Tag::PURPOSE;
blob.b.tee_enforced.params[1].integer = KeyPurpose::WRAP_KEY;
blob.b.tee_enforced.params_count++;
+ SHA256(reinterpret_cast<const uint8_t *>(&blob),
+ sizeof(struct km_blob) - SHA256_DIGEST_LENGTH,
+ reinterpret_cast<uint8_t *>(&blob.hmac));
request.set_key_format(KeyFormat::RAW);
KeyParameters *params = request.mutable_params();
