Source release 17.1.1

oemcrypto/util/test/oem_cert_test.cpp

@@ -2,9 +2,10 @@
 // source code may only be used and distributed under the Widevine License
 // Agreement.
 
-#include "oem_cert.h"
+#include "oem_cert_test.h"
 
-namespace wvoec_ref {
+namespace wvoec {
+namespace util {
 namespace {
 const uint32_t kTestOemSystemId = 7913;
 
@@ -529,4 +530,5 @@ const uint8_t* kOEMPublicCert = kTestOemPublicCert;
 
 const size_t kOEMPrivateKeySize = kTestOemPrivateKeySize;
 const size_t kOEMPublicCertSize = kTestOemPublicCertSize;
-}  // namespace wvoec_ref
+}  // namespace util
+}  // namespace wvoec

oemcrypto/util/test/oem_cert_test.h

@@ -0,0 +1,27 @@
+// Copyright 2022 Google LLC. All Rights Reserved. This file and proprietary
+// source code may only be used and distributed under the Widevine License
+// Agreement.
+//
+// This header is used to access the testing OEM certificate.
+#ifndef OEM_CERT_TEST_H_
+#define OEM_CERT_TEST_H_
+
+#include <stddef.h>
+#include <stdint.h>
+
+namespace wvoec {
+namespace util {
+
+// Refer to the following in main modules
+extern const uint32_t kOEMSystemId;
+
+extern const uint8_t* kOEMPrivateKey;
+extern const uint8_t* kOEMPublicCert;
+
+extern const size_t kOEMPrivateKeySize;
+extern const size_t kOEMPublicCertSize;
+
+}  // namespace util
+}  // namespace wvoec
+
+#endif  // OEM_CERT_TEST_H_

oemcrypto/util/test/oemcrypto_oem_cert_unittest.cpp

@@ -7,16 +7,12 @@
 #include <gtest/gtest.h>
 
 #include "OEMCryptoCENCCommon.h"
-#include "oem_cert.h"
+#include "oem_cert_test.h"
 #include "oemcrypto_oem_cert.h"
 #include "oemcrypto_rsa_key.h"
 
 namespace wvoec {
 namespace util {
-using wvoec_ref::kOEMPrivateKey;
-using wvoec_ref::kOEMPrivateKeySize;
-using wvoec_ref::kOEMPublicCert;
-using wvoec_ref::kOEMPublicCertSize;
 namespace {
 const std::vector<uint8_t> kOEMPrivateKeyVector(kOEMPrivateKey,
                                                 kOEMPrivateKey +