Snap for 4832339 from 1404f1630542ba9a26e669bb3eea4da50b2e4654 to pi-releaseandroid-wear-9.0.0_r9android-wear-9.0.0_r8android-wear-9.0.0_r7android-wear-9.0.0_r6android-wear-9.0.0_r5android-wear-9.0.0_r4android-wear-9.0.0_r34android-wear-9.0.0_r33android-wear-9.0.0_r32android-wear-9.0.0_r31android-wear-9.0.0_r30android-wear-9.0.0_r3android-wear-9.0.0_r29android-wear-9.0.0_r28android-wear-9.0.0_r27android-wear-9.0.0_r26android-wear-9.0.0_r25android-wear-9.0.0_r24android-wear-9.0.0_r23android-wear-9.0.0_r22android-wear-9.0.0_r21android-wear-9.0.0_r20android-wear-9.0.0_r2android-wear-9.0.0_r19android-wear-9.0.0_r18android-wear-9.0.0_r17android-wear-9.0.0_r16android-wear-9.0.0_r15android-wear-9.0.0_r14android-wear-9.0.0_r13android-wear-9.0.0_r12android-wear-9.0.0_r11android-wear-9.0.0_r10android-wear-9.0.0_r1android-vts-9.0_r9android-vts-9.0_r8android-vts-9.0_r7android-vts-9.0_r6android-vts-9.0_r5android-vts-9.0_r4android-vts-9.0_r19android-vts-9.0_r18android-vts-9.0_r17android-vts-9.0_r16android-vts-9.0_r15android-vts-9.0_r14android-vts-9.0_r13android-vts-9.0_r12android-vts-9.0_r11android-vts-9.0_r10android-security-9.0.0_r76android-security-9.0.0_r75android-security-9.0.0_r74android-security-9.0.0_r73android-security-9.0.0_r72android-security-9.0.0_r71android-security-9.0.0_r70android-security-9.0.0_r69android-security-9.0.0_r68android-security-9.0.0_r67android-security-9.0.0_r66android-security-9.0.0_r65android-security-9.0.0_r64android-security-9.0.0_r63android-security-9.0.0_r62android-cts-9.0_r9android-cts-9.0_r8android-cts-9.0_r7android-cts-9.0_r6android-cts-9.0_r5android-cts-9.0_r4android-cts-9.0_r3android-cts-9.0_r20android-cts-9.0_r2android-cts-9.0_r19android-cts-9.0_r18android-cts-9.0_r17android-cts-9.0_r16android-cts-9.0_r15android-cts-9.0_r14android-cts-9.0_r13android-cts-9.0_r12android-cts-9.0_r11android-cts-9.0_r10android-cts-9.0_r1android-9.0.0_r9android-9.0.0_r8android-9.0.0_r7android-9.0.0_r61android-9.0.0_r60android-9.0.0_r6android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r5android-9.0.0_r49android-9.0.0_r48android-9.0.0_r3android-9.0.0_r2android-9.0.0_r18android-9.0.0_r17android-9.0.0_r10android-9.0.0_r1security-pi-releasepie-vts-releasepie-security-releasepie-s2-releasepie-release-2pie-releasepie-r2-s2-releasepie-r2-s1-releasepie-r2-releasepie-cts-release

Change-Id: I32072f88654517b0370cea0e790f6edee78b59dd

2 files changed, 5 insertions, 1 deletions

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_ec {
 
 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 @@ TEST_F(ImportWrappedKeyTest, ImportSuccess) {
   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();