diff --git a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
index e1a0f713..e54c508f 100644
--- a/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
+++ b/libwvdrmengine/cdm/core/src/oemcrypto_adapter_dynamic.cpp
@@ -233,10 +233,6 @@ class Adapter {
   Adapter() : level1_valid_(false), level1_library_(NULL) {}
 
   ~Adapter() {
-    for (map_iterator i = session_map_.begin(); i != session_map_.end(); i++) {
-      if (i->second.fcn) i->second.fcn->CloseSession(i->second.session);
-    }
-    session_map_.clear();
   }
 
   OEMCryptoResult Initialize() {
@@ -405,6 +401,10 @@ class Adapter {
   }
 
   OEMCryptoResult Terminate() {
+    for (map_iterator i = session_map_.begin(); i != session_map_.end(); ++i) {
+      if (i->second.fcn) i->second.fcn->CloseSession(i->second.session);
+    }
+    session_map_.clear();
     OEMCryptoResult result = Level3_Terminate();
     if (level1_valid_) {
       result = level1_.Terminate();
@@ -602,6 +602,7 @@ OEMCryptoResult OEMCrypto_GetMaxNumberOfSessions(SecurityLevel level,
 
 extern "C" OEMCryptoResult OEMCrypto_Initialize(void) {
   if (kAdapter) {
+    kAdapter->Terminate();
     delete kAdapter;
   }
   kAdapter = new Adapter();
diff --git a/libwvdrmengine/level3/arm/libwvlevel3.a b/libwvdrmengine/level3/arm/libwvlevel3.a
index 80581c9d..7879c0af 100644
Binary files a/libwvdrmengine/level3/arm/libwvlevel3.a and b/libwvdrmengine/level3/arm/libwvlevel3.a differ
diff --git a/libwvdrmengine/level3/x86/libwvlevel3.a b/libwvdrmengine/level3/x86/libwvlevel3.a
index 1572143d..ac8d63f4 100644
Binary files a/libwvdrmengine/level3/x86/libwvlevel3.a and b/libwvdrmengine/level3/x86/libwvlevel3.a differ
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
index ed717639..c47ec44a 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
@@ -324,6 +324,7 @@ bool SessionContext::ValidateMessage(const uint8_t* given_message,
     return false;
   }
   uint8_t computed_signature[SHA256_DIGEST_LENGTH];
+  memset(computed_signature, 0, SHA256_DIGEST_LENGTH);
   unsigned int md_len = SHA256_DIGEST_LENGTH;
   if (!HMAC(EVP_sha256(), &mac_key_server_[0], mac_key_server_.size(),
             given_message, message_length, computed_signature, &md_len)) {
diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp
index 452adfc6..811ea058 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_key_mock.cpp
@@ -19,9 +19,10 @@ bool KeyControlBlock::Validate() {
       memcmp(verification_, "kc09", 4) &&  // add in version 9 api
       memcmp(verification_, "kc10", 4)) {  // add in version 10 api
     LOGE("KCB: BAD verification string: %4.4s", verification_);
-    return false;
+    valid_ = false;
+  } else {
+    valid_ = true;
   }
-  valid_ = true;
   return valid_;
 }
 
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index 660983f5..6533490a 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
@@ -190,159 +190,6 @@ static wvoec_mock::WidevineKeybox kValidKeybox03 = {
   }
 };
 
-// A 2048-bit test RSA Private Key
-// This is used to verify the functions that manipulate RSA keys.
-static const uint8_t kTestPKCS1RSAPrivateKey2_2048[] = {
-  0x30, 0x82, 0x04, 0xa2, 0x02, 0x01, 0x00, 0x02,
-  0x82, 0x01, 0x01, 0x00, 0xa7, 0x00, 0x36, 0x60,
-  0x65, 0xdc, 0xbd, 0x54, 0x5a, 0x2a, 0x40, 0xb4,
-  0xe1, 0x15, 0x94, 0x58, 0x11, 0x4f, 0x94, 0x58,
-  0xdd, 0xde, 0xa7, 0x1f, 0x3c, 0x2c, 0xe0, 0x88,
-  0x09, 0x29, 0x61, 0x57, 0x67, 0x5e, 0x56, 0x7e,
-  0xee, 0x27, 0x8f, 0x59, 0x34, 0x9a, 0x2a, 0xaa,
-  0x9d, 0xb4, 0x4e, 0xfa, 0xa7, 0x6a, 0xd4, 0xc9,
-  0x7a, 0x53, 0xc1, 0x4e, 0x9f, 0xe3, 0x34, 0xf7,
-  0x3d, 0xb7, 0xc9, 0x10, 0x47, 0x4f, 0x28, 0xda,
-  0x3f, 0xce, 0x31, 0x7b, 0xfd, 0x06, 0x10, 0xeb,
-  0xf7, 0xbe, 0x92, 0xf9, 0xaf, 0xfb, 0x3e, 0x68,
-  0xda, 0xee, 0x1a, 0x64, 0x4c, 0xf3, 0x29, 0xf2,
-  0x73, 0x9e, 0x39, 0xd8, 0xf6, 0x6f, 0xd8, 0xb2,
-  0x80, 0x82, 0x71, 0x8e, 0xb5, 0xa4, 0xf2, 0xc2,
-  0x3e, 0xcd, 0x0a, 0xca, 0xb6, 0x04, 0xcd, 0x9a,
-  0x13, 0x8b, 0x54, 0x73, 0x54, 0x25, 0x54, 0x8c,
-  0xbe, 0x98, 0x7a, 0x67, 0xad, 0xda, 0xb3, 0x4e,
-  0xb3, 0xfa, 0x82, 0xa8, 0x4a, 0x67, 0x98, 0x56,
-  0x57, 0x54, 0x71, 0xcd, 0x12, 0x7f, 0xed, 0xa3,
-  0x01, 0xc0, 0x6a, 0x8b, 0x24, 0x03, 0x96, 0x88,
-  0xbe, 0x97, 0x66, 0x2a, 0xbc, 0x53, 0xc9, 0x83,
-  0x06, 0x51, 0x5a, 0x88, 0x65, 0x13, 0x18, 0xe4,
-  0x3a, 0xed, 0x6b, 0xf1, 0x61, 0x5b, 0x4c, 0xc8,
-  0x1e, 0xf4, 0xc2, 0xae, 0x08, 0x5e, 0x2d, 0x5f,
-  0xf8, 0x12, 0x7f, 0xa2, 0xfc, 0xbb, 0x21, 0x18,
-  0x30, 0xda, 0xfe, 0x40, 0xfb, 0x01, 0xca, 0x2e,
-  0x37, 0x0e, 0xce, 0xdd, 0x76, 0x87, 0x82, 0x46,
-  0x0b, 0x3a, 0x77, 0x8f, 0xc0, 0x72, 0x07, 0x2c,
-  0x7f, 0x9d, 0x1e, 0x86, 0x5b, 0xed, 0x27, 0x29,
-  0xdf, 0x03, 0x97, 0x62, 0xef, 0x44, 0xd3, 0x5b,
-  0x3d, 0xdb, 0x9c, 0x5e, 0x1b, 0x7b, 0x39, 0xb4,
-  0x0b, 0x6d, 0x04, 0x6b, 0xbb, 0xbb, 0x2c, 0x5f,
-  0xcf, 0xb3, 0x7a, 0x05, 0x02, 0x03, 0x01, 0x00,
-  0x01, 0x02, 0x82, 0x01, 0x00, 0x5e, 0x79, 0x65,
-  0x49, 0xa5, 0x76, 0x79, 0xf9, 0x05, 0x45, 0x0f,
-  0xf4, 0x03, 0xbd, 0xa4, 0x7d, 0x29, 0xd5, 0xde,
-  0x33, 0x63, 0xd8, 0xb8, 0xac, 0x97, 0xeb, 0x3f,
-  0x5e, 0x55, 0xe8, 0x7d, 0xf3, 0xe7, 0x3b, 0x5c,
-  0x2d, 0x54, 0x67, 0x36, 0xd6, 0x1d, 0x46, 0xf5,
-  0xca, 0x2d, 0x8b, 0x3a, 0x7e, 0xdc, 0x45, 0x38,
-  0x79, 0x7e, 0x65, 0x71, 0x5f, 0x1c, 0x5e, 0x79,
-  0xb1, 0x40, 0xcd, 0xfe, 0xc5, 0xe1, 0xc1, 0x6b,
-  0x78, 0x04, 0x4e, 0x8e, 0x79, 0xf9, 0x0a, 0xfc,
-  0x79, 0xb1, 0x5e, 0xb3, 0x60, 0xe3, 0x68, 0x7b,
-  0xc6, 0xef, 0xcb, 0x71, 0x4c, 0xba, 0xa7, 0x79,
-  0x5c, 0x7a, 0x81, 0xd1, 0x71, 0xe7, 0x00, 0x21,
-  0x13, 0xe2, 0x55, 0x69, 0x0e, 0x75, 0xbe, 0x09,
-  0xc3, 0x4f, 0xa9, 0xc9, 0x68, 0x22, 0x0e, 0x97,
-  0x8d, 0x89, 0x6e, 0xf1, 0xe8, 0x88, 0x7a, 0xd1,
-  0xd9, 0x09, 0x5d, 0xd3, 0x28, 0x78, 0x25, 0x0b,
-  0x1c, 0x47, 0x73, 0x25, 0xcc, 0x21, 0xb6, 0xda,
-  0xc6, 0x24, 0x5a, 0xd0, 0x37, 0x14, 0x46, 0xc7,
-  0x94, 0x69, 0xe4, 0x43, 0x6f, 0x47, 0xde, 0x00,
-  0x33, 0x4d, 0x8f, 0x95, 0x72, 0xfa, 0x68, 0x71,
-  0x17, 0x66, 0x12, 0x1a, 0x87, 0x27, 0xf7, 0xef,
-  0x7e, 0xe0, 0x35, 0x58, 0xf2, 0x4d, 0x6f, 0x35,
-  0x01, 0xaa, 0x96, 0xe2, 0x3d, 0x51, 0x13, 0x86,
-  0x9c, 0x79, 0xd0, 0xb7, 0xb6, 0x64, 0xe8, 0x86,
-  0x65, 0x50, 0xbf, 0xcc, 0x27, 0x53, 0x1f, 0x51,
-  0xd4, 0xca, 0xbe, 0xf5, 0xdd, 0x77, 0x70, 0x98,
-  0x0f, 0xee, 0xa8, 0x96, 0x07, 0x5f, 0x45, 0x6a,
-  0x7a, 0x0d, 0x03, 0x9c, 0x4f, 0x29, 0xf6, 0x06,
-  0xf3, 0x5d, 0x58, 0x6c, 0x47, 0xd0, 0x96, 0xa9,
-  0x03, 0x17, 0xbb, 0x4e, 0xc9, 0x21, 0xe0, 0xac,
-  0xcd, 0x78, 0x78, 0xb2, 0xfe, 0x81, 0xb2, 0x51,
-  0x53, 0xa6, 0x1f, 0x98, 0x45, 0x02, 0x81, 0x81,
-  0x00, 0xcf, 0x73, 0x8c, 0xbe, 0x6d, 0x45, 0x2d,
-  0x0c, 0x0b, 0x5d, 0x5c, 0x6c, 0x75, 0x78, 0xcc,
-  0x35, 0x48, 0xb6, 0x98, 0xf1, 0xb9, 0x64, 0x60,
-  0x8c, 0x43, 0xeb, 0x85, 0xab, 0x04, 0xb6, 0x7d,
-  0x1b, 0x71, 0x75, 0x06, 0xe2, 0xda, 0x84, 0x68,
-  0x2e, 0x7f, 0x4c, 0xe3, 0x73, 0xb4, 0xde, 0x51,
-  0x4b, 0xb6, 0x51, 0x86, 0x7b, 0xd0, 0xe6, 0x4d,
-  0xf3, 0xd1, 0xcf, 0x1a, 0xfe, 0x7f, 0x3a, 0x83,
-  0xba, 0xb3, 0xe1, 0xff, 0x54, 0x13, 0x93, 0xd7,
-  0x9c, 0x27, 0x80, 0xb7, 0x1e, 0x64, 0x9e, 0xf7,
-  0x32, 0x2b, 0x46, 0x29, 0xf7, 0xf8, 0x18, 0x6c,
-  0xf7, 0x4a, 0xbe, 0x4b, 0xee, 0x96, 0x90, 0x8f,
-  0xa2, 0x16, 0x22, 0x6a, 0xcc, 0x48, 0x06, 0x74,
-  0x63, 0x43, 0x7f, 0x27, 0x22, 0x44, 0x3c, 0x2d,
-  0x3b, 0x62, 0xf1, 0x1c, 0xb4, 0x27, 0x33, 0x85,
-  0x26, 0x60, 0x48, 0x16, 0xcb, 0xef, 0xf8, 0xcd,
-  0x37, 0x02, 0x81, 0x81, 0x00, 0xce, 0x15, 0x43,
-  0x6e, 0x4b, 0x0f, 0xf9, 0x3f, 0x87, 0xc3, 0x41,
-  0x45, 0x97, 0xb1, 0x49, 0xc2, 0x19, 0x23, 0x87,
-  0xe4, 0x24, 0x1c, 0x64, 0xe5, 0x28, 0xcb, 0x43,
-  0x10, 0x14, 0x14, 0x0e, 0x19, 0xcb, 0xbb, 0xdb,
-  0xfd, 0x11, 0x9d, 0x17, 0x68, 0x78, 0x6d, 0x61,
-  0x70, 0x63, 0x3a, 0xa1, 0xb3, 0xf3, 0xa7, 0x5b,
-  0x0e, 0xff, 0xb7, 0x61, 0x11, 0x54, 0x91, 0x99,
-  0xe5, 0x91, 0x32, 0x2d, 0xeb, 0x3f, 0xd8, 0x3e,
-  0xf7, 0xd4, 0xcb, 0xd2, 0xa3, 0x41, 0xc1, 0xee,
-  0xc6, 0x92, 0x13, 0xeb, 0x7f, 0x42, 0x58, 0xf4,
-  0xd0, 0xb2, 0x74, 0x1d, 0x8e, 0x87, 0x46, 0xcd,
-  0x14, 0xb8, 0x16, 0xad, 0xb5, 0xbd, 0x0d, 0x6c,
-  0x95, 0x5a, 0x16, 0xbf, 0xe9, 0x53, 0xda, 0xfb,
-  0xed, 0x83, 0x51, 0x67, 0xa9, 0x55, 0xab, 0x54,
-  0x02, 0x95, 0x20, 0xa6, 0x68, 0x17, 0x53, 0xa8,
-  0xea, 0x43, 0xe5, 0xb0, 0xa3, 0x02, 0x81, 0x80,
-  0x67, 0x9c, 0x32, 0x83, 0x39, 0x57, 0xff, 0x73,
-  0xb0, 0x89, 0x64, 0x8b, 0xd6, 0xf0, 0x0a, 0x2d,
-  0xe2, 0xaf, 0x30, 0x1c, 0x2a, 0x97, 0xf3, 0x90,
-  0x9a, 0xab, 0x9b, 0x0b, 0x1b, 0x43, 0x79, 0xa0,
-  0xa7, 0x3d, 0xe7, 0xbe, 0x8d, 0x9c, 0xeb, 0xdb,
-  0xad, 0x40, 0xdd, 0xa9, 0x00, 0x80, 0xb8, 0xe1,
-  0xb3, 0xa1, 0x6c, 0x25, 0x92, 0xe4, 0x33, 0xb2,
-  0xbe, 0xeb, 0x4d, 0x74, 0x26, 0x5f, 0x37, 0x43,
-  0x9c, 0x6c, 0x17, 0x76, 0x0a, 0x81, 0x20, 0x82,
-  0xa1, 0x48, 0x2c, 0x2d, 0x45, 0xdc, 0x0f, 0x62,
-  0x43, 0x32, 0xbb, 0xeb, 0x59, 0x41, 0xf9, 0xca,
-  0x58, 0xce, 0x4a, 0x66, 0x53, 0x54, 0xc8, 0x28,
-  0x10, 0x1e, 0x08, 0x71, 0x16, 0xd8, 0x02, 0x71,
-  0x41, 0x58, 0xd4, 0x56, 0xcc, 0xf5, 0xb1, 0x31,
-  0xa3, 0xed, 0x00, 0x85, 0x09, 0xbf, 0x35, 0x95,
-  0x41, 0x29, 0x40, 0x19, 0x83, 0x35, 0x24, 0x69,
-  0x02, 0x81, 0x80, 0x55, 0x10, 0x0b, 0xcc, 0x3b,
-  0xa9, 0x75, 0x3d, 0x16, 0xe1, 0xae, 0x50, 0x76,
-  0x63, 0x94, 0x49, 0x4c, 0xad, 0x10, 0xcb, 0x47,
-  0x68, 0x7c, 0xf0, 0xe5, 0xdc, 0xb8, 0x6a, 0xab,
-  0x8e, 0xf7, 0x9f, 0x08, 0x2c, 0x1b, 0x8a, 0xa2,
-  0xb9, 0x8f, 0xce, 0xec, 0x5e, 0x61, 0xa8, 0xcd,
-  0x1c, 0x87, 0x60, 0x4a, 0xc3, 0x1a, 0x5f, 0xdf,
-  0x87, 0x26, 0xc6, 0xcb, 0x7c, 0x69, 0xe4, 0x8b,
-  0x01, 0x06, 0x59, 0x22, 0xfa, 0x34, 0x4b, 0x81,
-  0x87, 0x3c, 0x03, 0x6d, 0x02, 0x0a, 0x77, 0xe6,
-  0x15, 0xd8, 0xcf, 0xa7, 0x68, 0x26, 0x6c, 0xfa,
-  0x2b, 0xd9, 0x83, 0x5a, 0x2d, 0x0c, 0x3b, 0x70,
-  0x1c, 0xd4, 0x48, 0xbe, 0xa7, 0x0a, 0xd9, 0xbe,
-  0xdc, 0xc3, 0x0c, 0x21, 0x33, 0xb3, 0x66, 0xff,
-  0x1c, 0x1b, 0xc8, 0x96, 0x76, 0xe8, 0x6f, 0x44,
-  0x74, 0xbc, 0x9b, 0x1c, 0x7d, 0xc8, 0xac, 0x21,
-  0xa8, 0x6e, 0x37, 0x02, 0x81, 0x80, 0x2c, 0x7c,
-  0xad, 0x1e, 0x75, 0xf6, 0x69, 0x1d, 0xe7, 0xa6,
-  0xca, 0x74, 0x7d, 0x67, 0xc8, 0x65, 0x28, 0x66,
-  0xc4, 0x43, 0xa6, 0xbd, 0x40, 0x57, 0xae, 0xb7,
-  0x65, 0x2c, 0x52, 0xf9, 0xe4, 0xc7, 0x81, 0x7b,
-  0x56, 0xa3, 0xd2, 0x0d, 0xe8, 0x33, 0x70, 0xcf,
-  0x06, 0x84, 0xb3, 0x4e, 0x44, 0x50, 0x75, 0x61,
-  0x96, 0x86, 0x4b, 0xb6, 0x2b, 0xad, 0xf0, 0xad,
-  0x57, 0xd0, 0x37, 0x0d, 0x1d, 0x35, 0x50, 0xcb,
-  0x69, 0x22, 0x39, 0x29, 0xb9, 0x3a, 0xd3, 0x29,
-  0x23, 0x02, 0x60, 0xf7, 0xab, 0x30, 0x40, 0xda,
-  0x8e, 0x4d, 0x45, 0x70, 0x26, 0xf4, 0xa2, 0x0d,
-  0xd0, 0x64, 0x5d, 0x47, 0x3c, 0x18, 0xf4, 0xd4,
-  0x52, 0x95, 0x00, 0xae, 0x84, 0x6b, 0x47, 0xb2,
-  0x3c, 0x82, 0xd3, 0x72, 0x53, 0xde, 0x72, 0x2c,
-  0xf7, 0xc1, 0x22, 0x36, 0xd9, 0x18, 0x56, 0xfe,
-  0x39, 0x28, 0x33, 0xe0, 0xdb, 0x03 };
-
 // A 2048 bit RSA key in PKCS#8 PrivateKeyInfo format
 // Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPKCS8PrivateKeyInfo2_2048[] = {
@@ -537,159 +384,6 @@ static const uint8_t kTestRSAPublicKey2_2048[] = {
   0x6b, 0xbb, 0xbb, 0x2c, 0x5f, 0xcf, 0xb3, 0x7a,
   0x05, 0x02, 0x03, 0x01, 0x00, 0x01 };
 
-// A second 2048-bit RSA private key
-// This is used to verify the functions that manipulate RSA keys.
-static const uint8_t kTestPKCS1RSAPrivateKey3_2048[] = {
-  0x30, 0x82, 0x04, 0xa4, 0x02, 0x01, 0x00, 0x02,
-  0x82, 0x01, 0x01, 0x00, 0xa5, 0xd0, 0xd7, 0x3e,
-  0x0e, 0x2d, 0xfb, 0x43, 0x51, 0x99, 0xea, 0x40,
-  0x1e, 0x2d, 0x89, 0xe4, 0xa2, 0x3e, 0xfc, 0x51,
-  0x3d, 0x0e, 0x83, 0xa7, 0xe0, 0xa5, 0x41, 0x04,
-  0x1e, 0x14, 0xc5, 0xa7, 0x5c, 0x61, 0x36, 0x44,
-  0xb3, 0x08, 0x05, 0x5b, 0x14, 0xde, 0x01, 0x0c,
-  0x32, 0x3c, 0x9a, 0x91, 0x00, 0x50, 0xa8, 0x1d,
-  0xcc, 0x9f, 0x8f, 0x35, 0xb7, 0xc2, 0x75, 0x08,
-  0x32, 0x8b, 0x10, 0x3a, 0x86, 0xf9, 0xd7, 0x78,
-  0xa3, 0x9d, 0x74, 0x10, 0xc6, 0x24, 0xb1, 0x7f,
-  0xa5, 0xbf, 0x5f, 0xc2, 0xd7, 0x15, 0xa3, 0x1d,
-  0xe0, 0x15, 0x6b, 0x1b, 0x0e, 0x38, 0xba, 0x34,
-  0xbc, 0x95, 0x47, 0x94, 0x40, 0x70, 0xac, 0x99,
-  0x1f, 0x0b, 0x8e, 0x56, 0x93, 0x36, 0x2b, 0x6d,
-  0x04, 0xe7, 0x95, 0x1a, 0x37, 0xda, 0x16, 0x57,
-  0x99, 0xee, 0x03, 0x68, 0x16, 0x31, 0xaa, 0xc3,
-  0xb7, 0x92, 0x75, 0x53, 0xfc, 0xf6, 0x20, 0x55,
-  0x44, 0xf8, 0xd4, 0x8d, 0x78, 0x15, 0xc7, 0x1a,
-  0xb6, 0xde, 0x6c, 0xe8, 0x49, 0x5d, 0xaf, 0xa8,
-  0x4e, 0x6f, 0x7c, 0xe2, 0x6a, 0x4c, 0xd5, 0xe7,
-  0x8c, 0x8f, 0x0b, 0x5d, 0x3a, 0x09, 0xd6, 0xb3,
-  0x44, 0xab, 0xe0, 0x35, 0x52, 0x7c, 0x66, 0x85,
-  0xa4, 0x40, 0xd7, 0x20, 0xec, 0x24, 0x05, 0x06,
-  0xd9, 0x84, 0x51, 0x5a, 0xd2, 0x38, 0xd5, 0x1d,
-  0xea, 0x70, 0x2a, 0x21, 0xe6, 0x82, 0xfd, 0xa4,
-  0x46, 0x1c, 0x4f, 0x59, 0x6e, 0x29, 0x3d, 0xae,
-  0xb8, 0x8e, 0xee, 0x77, 0x1f, 0x15, 0x33, 0xcf,
-  0x94, 0x1d, 0x87, 0x3c, 0x37, 0xc5, 0x89, 0xe8,
-  0x7d, 0x85, 0xb3, 0xbc, 0xe8, 0x62, 0x6a, 0x84,
-  0x7f, 0xfe, 0x9a, 0x85, 0x3f, 0x39, 0xe8, 0xaa,
-  0x16, 0xa6, 0x8f, 0x87, 0x7f, 0xcb, 0xc1, 0xd6,
-  0xf2, 0xec, 0x2b, 0xa7, 0xdd, 0x49, 0x98, 0x7b,
-  0x6f, 0xdd, 0x69, 0x6d, 0x02, 0x03, 0x01, 0x00,
-  0x01, 0x02, 0x82, 0x01, 0x00, 0x43, 0x8f, 0x19,
-  0x83, 0xb1, 0x27, 0x4e, 0xee, 0x98, 0xba, 0xcb,
-  0x54, 0xa0, 0x77, 0x11, 0x6d, 0xd4, 0x25, 0x31,
-  0x8c, 0xb0, 0x01, 0xcf, 0xe6, 0x80, 0x83, 0x14,
-  0x40, 0x67, 0x39, 0x33, 0x67, 0x03, 0x1e, 0xa0,
-  0x8b, 0xd1, 0x1d, 0xfd, 0x80, 0xa4, 0xb9, 0xe7,
-  0x57, 0x5e, 0xc8, 0x8e, 0x79, 0x71, 0xd5, 0x6b,
-  0x09, 0xe9, 0x2b, 0x41, 0xa0, 0x33, 0x64, 0xc9,
-  0x66, 0x33, 0xa1, 0xb1, 0x55, 0x07, 0x55, 0x98,
-  0x53, 0x10, 0xe6, 0xc0, 0x39, 0x6d, 0x61, 0xd9,
-  0xe8, 0x16, 0x52, 0x28, 0xe4, 0x2b, 0xda, 0x27,
-  0x01, 0xaf, 0x21, 0x4a, 0xe8, 0x55, 0x1d, 0x0b,
-  0xd1, 0x1c, 0xdc, 0xfd, 0xb3, 0x0b, 0xa6, 0x5c,
-  0xcc, 0x6e, 0x77, 0xb8, 0xe0, 0xd1, 0x4e, 0x0a,
-  0xd7, 0x7a, 0x5e, 0x18, 0xc3, 0xfb, 0xe9, 0xa1,
-  0x9c, 0xc3, 0x9c, 0xd4, 0x4a, 0x7e, 0x70, 0x72,
-  0x11, 0x18, 0x24, 0x56, 0x24, 0xdf, 0xf8, 0xba,
-  0xac, 0x5b, 0x54, 0xd3, 0xc4, 0x65, 0x69, 0xc8,
-  0x79, 0x94, 0x16, 0x88, 0x9a, 0x68, 0x1c, 0xbc,
-  0xd4, 0xca, 0xec, 0x5e, 0x07, 0x4a, 0xc9, 0x54,
-  0x7a, 0x4b, 0xdb, 0x19, 0x88, 0xf6, 0xbe, 0x50,
-  0x9d, 0x9e, 0x9d, 0x88, 0x5b, 0x4a, 0x23, 0x86,
-  0x2b, 0xa9, 0xa6, 0x6c, 0x70, 0x7d, 0xe1, 0x11,
-  0xba, 0xbf, 0x03, 0x2e, 0xf1, 0x46, 0x7e, 0x1b,
-  0xed, 0x06, 0x11, 0x57, 0xad, 0x4a, 0xcb, 0xe5,
-  0xb1, 0x11, 0x05, 0x0a, 0x30, 0xb1, 0x73, 0x79,
-  0xcd, 0x7a, 0x04, 0xcc, 0x70, 0xe9, 0x95, 0xe4,
-  0x27, 0xc2, 0xd5, 0x2d, 0x92, 0x44, 0xdf, 0xb4,
-  0x94, 0xa8, 0x73, 0xa1, 0x4a, 0xc3, 0xcc, 0xc4,
-  0x0e, 0x8d, 0xa1, 0x6a, 0xc2, 0xd8, 0x03, 0x7f,
-  0xfa, 0xa7, 0x76, 0x0d, 0xad, 0x87, 0x88, 0xa0,
-  0x77, 0xaf, 0x3b, 0x23, 0xd1, 0x66, 0x0b, 0x31,
-  0x2b, 0xaf, 0xef, 0xd5, 0x41, 0x02, 0x81, 0x81,
-  0x00, 0xdb, 0xc1, 0xe7, 0xdd, 0xba, 0x3c, 0x1f,
-  0x9c, 0x64, 0xca, 0xa0, 0x63, 0xdb, 0xd2, 0x47,
-  0x5c, 0x6e, 0x8a, 0xa3, 0x16, 0xd5, 0xda, 0xc2,
-  0x25, 0x64, 0x0a, 0x02, 0xbc, 0x7d, 0x7f, 0x50,
-  0xab, 0xe0, 0x66, 0x03, 0x53, 0x7d, 0x77, 0x6d,
-  0x6c, 0x61, 0x58, 0x09, 0x73, 0xcd, 0x18, 0xe9,
-  0x53, 0x0b, 0x5c, 0xa2, 0x71, 0x14, 0x02, 0xfd,
-  0x55, 0xda, 0xe9, 0x77, 0x24, 0x7c, 0x2a, 0x4e,
-  0xb9, 0xd9, 0x5d, 0x58, 0xf6, 0x26, 0xd0, 0xd8,
-  0x3d, 0xcf, 0x8c, 0x89, 0x65, 0x6c, 0x35, 0x19,
-  0xb6, 0x63, 0xff, 0xa0, 0x71, 0x49, 0xcd, 0x6d,
-  0x5b, 0x3d, 0x8f, 0xea, 0x6f, 0xa9, 0xba, 0x43,
-  0xe5, 0xdd, 0x39, 0x3a, 0x78, 0x8f, 0x07, 0xb8,
-  0xab, 0x58, 0x07, 0xb7, 0xd2, 0xf8, 0x07, 0x02,
-  0x9b, 0x79, 0x26, 0x32, 0x22, 0x38, 0x91, 0x01,
-  0x90, 0x81, 0x29, 0x94, 0xad, 0x77, 0xeb, 0x86,
-  0xb9, 0x02, 0x81, 0x81, 0x00, 0xc1, 0x29, 0x88,
-  0xbd, 0x96, 0x31, 0x33, 0x7b, 0x77, 0x5d, 0x32,
-  0x12, 0x5e, 0xdf, 0x28, 0x0c, 0x96, 0x0d, 0xa8,
-  0x22, 0xdf, 0xd3, 0x35, 0xd7, 0xb0, 0x41, 0xcb,
-  0xe7, 0x94, 0x8a, 0xa4, 0xed, 0xd2, 0xfb, 0xd2,
-  0xf3, 0xf2, 0x95, 0xff, 0xd8, 0x33, 0x3f, 0x8c,
-  0xd7, 0x65, 0xe4, 0x0c, 0xcc, 0xfe, 0x32, 0x66,
-  0xfa, 0x50, 0xe2, 0xcf, 0xf0, 0xbe, 0x05, 0xb1,
-  0xbc, 0xbe, 0x44, 0x09, 0xb4, 0xfe, 0x95, 0x06,
-  0x18, 0xd7, 0x59, 0xc6, 0xef, 0x2d, 0x22, 0xa0,
-  0x73, 0x5e, 0x77, 0xdf, 0x8d, 0x09, 0x2c, 0xb8,
-  0xcc, 0xeb, 0x10, 0x4d, 0xa7, 0xd0, 0x4b, 0x46,
-  0xba, 0x7d, 0x8b, 0x6a, 0x55, 0x47, 0x55, 0xd3,
-  0xd7, 0xb1, 0x88, 0xfd, 0x27, 0x3e, 0xf9, 0x5b,
-  0x7b, 0xae, 0x6d, 0x08, 0x9f, 0x0c, 0x2a, 0xe1,
-  0xdd, 0xb9, 0xe3, 0x55, 0x13, 0x55, 0xa3, 0x6d,
-  0x06, 0xbb, 0xe0, 0x1e, 0x55, 0x02, 0x81, 0x80,
-  0x61, 0x73, 0x3d, 0x64, 0xff, 0xdf, 0x05, 0x8d,
-  0x8e, 0xcc, 0xa4, 0x0f, 0x64, 0x3d, 0x7d, 0x53,
-  0xa9, 0xd9, 0x64, 0xb5, 0x0d, 0xa4, 0x72, 0x8f,
-  0xae, 0x2b, 0x1a, 0x47, 0x87, 0xc7, 0x5b, 0x78,
-  0xbc, 0x8b, 0xc0, 0x51, 0xd7, 0xc3, 0x8c, 0x0c,
-  0x91, 0xa6, 0x3e, 0x9a, 0xd1, 0x8a, 0x88, 0x7d,
-  0x40, 0xfe, 0x95, 0x32, 0x5b, 0xd3, 0x6f, 0x90,
-  0x11, 0x01, 0x92, 0xc9, 0xe5, 0x1d, 0xc5, 0xc7,
-  0x78, 0x72, 0x82, 0xae, 0xb5, 0x4b, 0xcb, 0x78,
-  0xad, 0x7e, 0xfe, 0xb6, 0xb1, 0x23, 0x63, 0x01,
-  0x94, 0x9a, 0x99, 0x05, 0x63, 0xda, 0xea, 0xf1,
-  0x98, 0xfd, 0x26, 0xd2, 0xd9, 0x8b, 0x35, 0xec,
-  0xcb, 0x0b, 0x43, 0xb8, 0x8e, 0x84, 0xb8, 0x09,
-  0x93, 0x81, 0xe8, 0xac, 0x6f, 0x3c, 0x7c, 0x95,
-  0x81, 0x45, 0xc4, 0xd9, 0x94, 0x08, 0x09, 0x8f,
-  0x91, 0x17, 0x65, 0x4c, 0xff, 0x6e, 0xbc, 0x51,
-  0x02, 0x81, 0x81, 0x00, 0xc1, 0x0d, 0x9d, 0xd8,
-  0xbd, 0xaf, 0x56, 0xe0, 0xe3, 0x1f, 0x85, 0xd7,
-  0xce, 0x72, 0x02, 0x38, 0xf2, 0x0f, 0x9c, 0x27,
-  0x9e, 0xc4, 0x1d, 0x60, 0x00, 0x8d, 0x02, 0x19,
-  0xe5, 0xdf, 0xdb, 0x8e, 0xc5, 0xfb, 0x61, 0x8e,
-  0xe6, 0xb8, 0xfc, 0x07, 0x3c, 0xd1, 0x1b, 0x16,
-  0x7c, 0x83, 0x3c, 0x37, 0xf5, 0x26, 0xb2, 0xbd,
-  0x22, 0xf2, 0x4d, 0x19, 0x33, 0x11, 0xc5, 0xdd,
-  0xf9, 0xdb, 0x4e, 0x48, 0x52, 0xd8, 0xe6, 0x4b,
-  0x15, 0x90, 0x68, 0xbe, 0xca, 0xc1, 0x7c, 0xd3,
-  0x51, 0x6b, 0x45, 0x46, 0x54, 0x11, 0x1a, 0x71,
-  0xd3, 0xcd, 0x6b, 0x8f, 0x79, 0x22, 0x83, 0x02,
-  0x08, 0x4f, 0xba, 0x6a, 0x98, 0xed, 0x32, 0xd8,
-  0xb4, 0x5b, 0x51, 0x88, 0x53, 0xec, 0x2c, 0x7e,
-  0xa4, 0x89, 0xdc, 0xbf, 0xf9, 0x0d, 0x32, 0xc8,
-  0xc3, 0xec, 0x6d, 0x2e, 0xf1, 0xbc, 0x70, 0x4e,
-  0xf6, 0x9e, 0xbc, 0x31, 0x02, 0x81, 0x81, 0x00,
-  0xd3, 0x35, 0x1b, 0x19, 0x75, 0x3f, 0x61, 0xf2,
-  0x55, 0x03, 0xce, 0x25, 0xa9, 0xdf, 0x0c, 0x0a,
-  0x3b, 0x47, 0x42, 0xdc, 0x38, 0x4b, 0x13, 0x4d,
-  0x1f, 0x86, 0x58, 0x4f, 0xd8, 0xee, 0xfa, 0x76,
-  0x15, 0xfb, 0x6e, 0x55, 0x31, 0xf2, 0xd2, 0x62,
-  0x32, 0xa5, 0xc4, 0x23, 0x5e, 0x08, 0xa9, 0x83,
-  0x07, 0xac, 0x8c, 0xa3, 0x7e, 0x18, 0xc0, 0x1c,
-  0x57, 0x63, 0x8d, 0x05, 0x17, 0x47, 0x1b, 0xd3,
-  0x74, 0x73, 0x20, 0x04, 0xfb, 0xc8, 0x1a, 0x43,
-  0x04, 0x36, 0xc8, 0x19, 0xbe, 0xdc, 0xa6, 0xe5,
-  0x0f, 0x25, 0x62, 0x24, 0x96, 0x92, 0xb6, 0xb3,
-  0x97, 0xad, 0x57, 0x9a, 0x90, 0x37, 0x4e, 0x31,
-  0x44, 0x74, 0xfa, 0x7c, 0xb4, 0xea, 0xfc, 0x15,
-  0xa7, 0xb0, 0x51, 0xcc, 0xee, 0x1e, 0xed, 0x5b,
-  0x98, 0x18, 0x0e, 0x65, 0xb6, 0x4b, 0x69, 0x0b,
-  0x21, 0xdc, 0x86, 0x17, 0x6e, 0xc8, 0xee, 0x24 };
-
 // A second 2048 bit RSA key in PKCS#8 PrivateKeyInfo format
 // Used to verify the functions that manipulate RSA keys.
 static const uint8_t kTestRSAPKCS8PrivateKeyInfo3_2048[] = {
@@ -1153,7 +847,7 @@ class Session {
 
   template <typename T>
   void ServerSignMessage(const T& data, std::vector<uint8_t>* signature) {
-    signature->resize(SHA256_DIGEST_LENGTH);
+    signature->assign(SHA256_DIGEST_LENGTH, 0);
     unsigned int md_len = SHA256_DIGEST_LENGTH;
     HMAC(EVP_sha256(), &mac_key_server_[0], mac_key_server_.size(),
          reinterpret_cast<const uint8_t*>(&data), sizeof(data),
@@ -1162,7 +856,7 @@ class Session {
 
   void ClientSignMessage(const vector<uint8_t>& data,
                          std::vector<uint8_t>* signature) {
-    signature->resize(SHA256_DIGEST_LENGTH);
+    signature->assign(SHA256_DIGEST_LENGTH, 0);
     unsigned int md_len = SHA256_DIGEST_LENGTH;
     HMAC(EVP_sha256(), &mac_key_client_[0], mac_key_client_.size(),
          &(data.front()), data.size(), &(signature->front()), &md_len);
@@ -1233,6 +927,7 @@ class Session {
 
     // Describe the output
     uint8_t outputBuffer[256];
+    memset(outputBuffer, 0, sizeof(outputBuffer));
     OEMCrypto_DestBufferDesc destBuffer;
     destBuffer.type = OEMCrypto_BufferType_Clear;
     destBuffer.buffer.clear.address = outputBuffer;
@@ -1337,7 +1032,7 @@ class Session {
                   encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                   &wrapped_key_length));
     wrapped_key->clear();
-    wrapped_key->resize(wrapped_key_length);
+    wrapped_key->assign(wrapped_key_length, 0);
     OEMCryptoResult sts = OEMCrypto_RewrapDeviceRSAKey(
         session_id(), message_ptr, sizeof(encrypted), &signature[0],
         signature.size(), &encrypted.nonce, encrypted.rsa_key,
@@ -2828,33 +2523,6 @@ TEST_F(DISABLED_TestKeybox, KeyDuration) {
 //
 // Certificate Root of Trust Tests
 //
-void TestKey(const uint8_t key[], size_t length) {
-  uint8_t const* p = key;
-  RSA* rsa = d2i_RSAPrivateKey(0, &p, length);
-  if (!rsa) {
-    cout << "d2i_RSAPrivateKey failed. ";
-    dump_openssl_error();
-    ASSERT_TRUE(false);
-  }
-  switch (RSA_check_key(rsa)) {
-    case 1:  // valid.
-      ASSERT_TRUE(true);
-      return;
-    case 0:  // not valid.
-      cout << "[TestKey(): rsa key not valid] ";
-      dump_openssl_error();
-      ASSERT_TRUE(false);
-    default:  // -1 == check failed.
-      cout << "[TestKey(): error checking rsa key] ";
-      dump_openssl_error();
-      ASSERT_TRUE(false);
-  }
-}
-TEST_F(DISABLED_TestKeybox, ValidateRSATestKeys) {
-  TestKey(kTestPKCS1RSAPrivateKey2_2048, sizeof(kTestPKCS1RSAPrivateKey2_2048));
-  TestKey(kTestPKCS1RSAPrivateKey3_2048, sizeof(kTestPKCS1RSAPrivateKey3_2048));
-}
-
 TEST_F(DISABLED_TestKeybox, CertificateProvision) {
   Session s;
   s.open();
@@ -2888,7 +2556,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadRange1) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   uint32_t nonce = encrypted.nonce;
   ASSERT_NE(
       OEMCrypto_SUCCESS,
@@ -2915,7 +2583,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadRange2) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   vector<uint8_t> bad_buffer(encrypted.rsa_key,
                              encrypted.rsa_key + sizeof(encrypted.rsa_key));
 
@@ -2945,7 +2613,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadRange3) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   vector<uint8_t> bad_buffer(encrypted.rsa_key,
                              encrypted.rsa_key + sizeof(encrypted.rsa_key));
 
@@ -2975,7 +2643,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadSignature) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   signature[4] ^= 42;  // bad signature.
   ASSERT_NE(OEMCrypto_SUCCESS,
             OEMCrypto_RewrapDeviceRSAKey(
@@ -3003,7 +2671,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadNonce) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   encrypted.nonce ^= 42;  // Almost surely a bad nonce.
   ASSERT_NE(OEMCrypto_SUCCESS,
             OEMCrypto_RewrapDeviceRSAKey(
@@ -3031,7 +2699,7 @@ TEST_F(DISABLED_TestKeybox, CertificateProvisionBadRSAKey) {
                 encrypted.rsa_key_length, encrypted.rsa_key_iv, NULL,
                 &wrapped_key_length));
   wrapped_key.clear();
-  wrapped_key.resize(wrapped_key_length);
+  wrapped_key.assign(wrapped_key_length, 0);
   encrypted.rsa_key[1] ^= 42;  // Almost surely a bad key.
   ASSERT_NE(OEMCrypto_SUCCESS,
             OEMCrypto_RewrapDeviceRSAKey(