Update to support OEMCrypto v16 with ODK

provisioning_sdk/public/provisioning_engine.h

@@ -17,7 +17,6 @@
 
 #include "common/certificate_type.h"
 #include "provisioning_sdk/public/provisioning_status.h"
-#include "protos/public/certificate_provisioning.pb.h"
 
 namespace widevine {
 
@@ -65,7 +64,8 @@ class ProvisioningEngine {
   //   derivation of Stable Per-Origin IDentifiers.
   // * Returns OK on success, or an appropriate error status code otherwise.
   ProvisioningStatus Initialize(
-      CertificateType certificate_type, const std::string& service_drm_certificate,
+      CertificateType certificate_type,
+      const std::string& service_drm_certificate,
       const std::string& service_private_key,
       const std::string& service_private_key_passphrase,
       const std::string& provisioning_drm_certificate,
@@ -78,7 +78,7 @@ class ProvisioningEngine {
   //   SignedProvisioningMessage message.
   // * |session_factory| is the function which instantiates the appropriate
   //   ProvisioningSessionImpl object for the specified protocol.
-  void RegisterProtocol(SignedProvisioningMessage::ProtocolVersion protocol,
+  void RegisterProtocol(int protocol,
                         SessionFactory session_factory);
 
   // Set the certificate status list for this engine.
@@ -89,7 +89,8 @@ class ProvisioningEngine {
   //   (creation_time_seconds). Zero means it will never expire.
   // * Returns OK on success, or an appropriate error status code otherwise.
   virtual ProvisioningStatus SetCertificateStatusList(
-      const std::string& certificate_status_list, uint32_t expiration_period_seconds);
+      const std::string& certificate_status_list,
+      uint32_t expiration_period_seconds);
 
   // Generate an intermediate DRM certificate.
   // * |system_id| is the Widevine system ID for the type of device.
@@ -103,7 +104,8 @@ class ProvisioningEngine {
   //       engines, including this one, by invoking
   //       |AddIntermediatedrmcertificate| on all active ProvisioningEngine(s).
   ProvisioningStatus GenerateDrmIntermediateCertificate(
-      uint32_t system_id, const std::string& public_key, std::string* certificate) const;
+      uint32_t system_id, const std::string& public_key,
+      std::string* certificate) const;
 
   // Add an intermediate DRM certificate to the provisioning engine. This is
   // usually done once for each supported device type.
@@ -134,29 +136,15 @@ class ProvisioningEngine {
   // NOTE: All ProvisioningSession objects must be deleted before the
   //       ProvisioningEngine which created them.
   virtual ProvisioningStatus NewProvisioningSession(
-      SignedProvisioningMessage::ProtocolVersion protocol,
-      const std::string& device_public_key, const std::string& device_private_key,
+      const std::string& device_public_key,
+      const std::string& device_private_key,
       std::unique_ptr<ProvisioningSession>* new_session) const;
 
   // This is the same as NewProvisioningSession above, but with outputs reversed
   // To get around CLIF bug https://github.com/google/clif/issues/30.
   std::unique_ptr<ProvisioningSession> NewProvisioningSession(
-      SignedProvisioningMessage::ProtocolVersion protocol,
-      const std::string& device_public_key, const std::string& device_private_key,
-      ProvisioningStatus* status) const;
-
-  // Create a session to handle a keybox provisioning exchange between
-  // a client device (e.g., ChromeOS) and the provisioning server.
-  // It would use ARCPP_PROVISIONING protocol.
-  // * |keybox_device_key| is the secret device key in the keybox.
-  // * |new_session| will point, on successful return, to the newly created
-  //   ProvisioningSession.
-  // * Returns OK if successful, or an appropriate error status code otherwise.
-  // NOTE: All ProvisioningSession objects must be deleted before the
-  //       ProvisioningEngine which created them.
-  virtual ProvisioningStatus NewKeyboxProvisioningSession(
-      const std::string& keybox_device_key,
-      std::unique_ptr<ProvisioningSession>* new_session) const;
+      const std::string& device_public_key,
+      const std::string& device_private_key, ProvisioningStatus* status) const;
 
   // Generate a new device DRM certificate to be provisioned by means other than
   // the Widevine provisioning protocol.
@@ -173,13 +161,12 @@ class ProvisioningEngine {
   // * |certificate| will contain, upon successful return the generated
   //   certificate.
   // * Returns OK on success, or an appropriate error status code otherwise.
-  ProvisioningStatus GenerateDeviceDrmCertificate(uint32_t system_id,
-                                                  const std::string& public_key,
-                                                  const std::string& serial_number,
-                                                  std::string* certificate) const;
+  ProvisioningStatus GenerateDeviceDrmCertificate(
+      uint32_t system_id, const std::string& public_key,
+      const std::string& serial_number, std::string* certificate) const;
 
  private:
-  std::map<SignedProvisioningMessage::ProtocolVersion, SessionFactory>
+  std::map<int, SessionFactory>
       protocol_registry_;
 
 #ifndef SWIGPYTHON