From 2069af7771c1f659c68ea1c466b68b2032a52080 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Mon, 31 Mar 2014 15:35:12 -0700
Subject: [PATCH] Remove Test Keybox - DO NOT MERGE

This CL removes the test keybox from the reference
implementation. This keybox is only needed temporarily for Cast
testing with the test server before the real certificate server is
working.

Change-Id: Icb8b5587acc91fd9f3ec35f04f91734437f804e0
---
 .../mock/src/oemcrypto_keybox_mock.cpp        | 35 -------------------
 1 file changed, 35 deletions(-)

diff --git a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp
index 5b92aff4..37bac013 100644
--- a/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp
+++ b/libwvdrmengine/oemcrypto/mock/src/oemcrypto_keybox_mock.cpp
@@ -18,9 +18,6 @@
 namespace wvoec_mock {
 
 const WidevineKeybox kDefaultKeybox = {
-
-// change to #if 0 for test provisioning server with mock library
-#if 1
   // Sample keybox used for test vectors
   {
     // deviceID
@@ -50,38 +47,6 @@ const WidevineKeybox kDefaultKeybox = {
     // Crc
     0x0a, 0x7a, 0x2c, 0x35,
   }
-#else
-  // Test keybox for temporary CAST provisioning server
-  {
-      // deviceID
-      0x61, 0x31, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // a1
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-      0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, // ........
-  }, {
-      // key
-      0x92, 0x13, 0xa7, 0xb0, 0x0e, 0xd9, 0x2c, 0xb0,
-      0xba, 0x61, 0xc1, 0x89, 0x1f, 0x45, 0x34, 0x4a,
-  }, {
-      // data
-      0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x10, 0x04,
-      0x20, 0x8b, 0xf0, 0xba, 0x89, 0x39, 0x73, 0xb6,
-      0x59, 0x82, 0x62, 0xa4, 0x72, 0x0c, 0xfe, 0xf4,
-      0x70, 0xa7, 0x0a, 0xc6, 0xe5, 0x7c, 0x5e, 0x04,
-      0x43, 0x8f, 0xa2, 0x87, 0x2b, 0xe1, 0x01, 0x67,
-      0xba, 0x04, 0x99, 0x73, 0xe1, 0x92, 0x6e, 0x6e,
-      0x9a, 0xf7, 0x67, 0x4e, 0xcd, 0xff, 0xb8, 0x43,
-      0xc0, 0xb7, 0xa5, 0x5e, 0xc4, 0xd7, 0x3f, 0x35,
-      0xf3, 0xc1, 0x84, 0x22, 0xe6, 0xf8, 0x2e, 0xfc,
-  }, {
-      // magic
-      0x6b, 0x62, 0x6f, 0x78,
-  }, {
-      // Crc
-      0x74, 0x57, 0x35, 0x2f,
-  }
-#endif
-
 };
 
 WvKeybox::WvKeybox() : valid_(false) {