Refactor and cleanup codes. No functional changes.

provisioning_sdk/internal/oem_device_cert.cc

@@ -1,5 +1,5 @@
 ////////////////////////////////////////////////////////////////////////////////
-// Copyright 2016 Google Inc.
+// Copyright 2016 Google LLC.
 //
 // This software is licensed under the terms defined in the Widevine Master
 // License Agreement. For a copy of this agreement, please contact
@@ -11,10 +11,12 @@
 #include <string.h>
 
 #include "glog/logging.h"
+#include "absl/memory/memory.h"
 #include "openssl/asn1.h"
+#include "openssl/pkcs7.h"
 #include "openssl/x509.h"
 #include "openssl/x509v3.h"
-#include "provisioning_sdk/internal/certificates/root_certificates.h"
+#include "provisioning_sdk/internal/certificates/root_oem_certificates.h"
 
 namespace widevine {
 namespace {
@@ -29,7 +31,7 @@ bool ExtractPublicKey(X509* x509, std::unique_ptr<RsaPublicKey>* public_key) {
     LOG(WARNING) << "X509_get_pubkey failed.";
     return false;
   }
-  public_key->reset(new RsaPublicKey(EVP_PKEY_get1_RSA(pkey.get())));
+  *public_key = absl::make_unique<RsaPublicKey>(EVP_PKEY_get1_RSA(pkey.get()));
   return true;
 }
 
@@ -105,12 +107,12 @@ OemDeviceCert::OemDeviceCert() {}
 OemDeviceCert::~OemDeviceCert() {}
 
 bool OemDeviceCert::Initialize(CertificateType certificate_type) {
-  RootCertificates root_certificates;
+  RootOemCertificates root_certificates;
   switch (certificate_type) {
-    case kCertTesting:
-    case kCertDevelopment:
+    case kCertificateTypeTesting:
+    case kCertificateTypeDevelopment:
       return Initialize(root_certificates.oem_root_dev_certificate());
-    case kCertProduction:
+    case kCertificateTypeProduction:
       return Initialize(root_certificates.oem_root_prod_certificate());
     default:
       LOG(WARNING) << "Invalid certificate type " << certificate_type;