Release provisioning sdk 8d17e45

protos/public/certificate_provisioning.proto

@@ -1,5 +1,11 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
-// Author: tinskip@google.com (Thomas Inskip)
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2016 Google Inc.
+//
+// This software is licensed under the terms defined in the Widevine Master
+// License Agreement. For a copy of this agreement, please contact
+// widevine-licensing@google.com.
+////////////////////////////////////////////////////////////////////////////////
+
 //
 // Description:
 //   Public protocol buffer definitions for Widevine Device Certificate
@@ -39,12 +45,16 @@ message ProvisioningRequest {
   optional bytes nonce = 2;
   // Options for type of certificate to generate.  Optional.
   optional ProvisioningOptions options = 3;
-  oneof origin_id {
+  oneof spoid_param {
     // Stable identifier, unique for each device + application (or origin).
-    // Required if doing per-origin provisioning.
+    // To be deprecated.
     bytes stable_id = 4;
-    // Stable content provider ID.
+    // Service provider ID from the service certificate's provider_id field.
+    // Preferred parameter.
     bytes provider_id = 6;
+    // Client-generated stable per-origin identifier to be copied directly
+    // to the client certificate serial number.
+    bytes spoid = 7;
   }
 }
 

protos/public/client_identification.proto

@@ -1,5 +1,11 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
-// Author: tinskip@google.com (Thomas Inskip)
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2016 Google Inc.
+//
+// This software is licensed under the terms defined in the Widevine Master
+// License Agreement. For a copy of this agreement, please contact
+// widevine-licensing@google.com.
+////////////////////////////////////////////////////////////////////////////////
+
 //
 // Description:
 //   ClientIdentification messages used by provisioning and license protocols.
@@ -37,6 +43,11 @@ message ClientIdentification {
       HDCP_NO_DIGITAL_OUTPUT = 0xff;
     }
 
+    enum CertificateKeyType {
+      RSA_2048 = 0;
+      RSA_3072 = 1;
+    }
+
     optional bool client_token = 1 [default = false];
     optional bool session_token = 2 [default = false];
     optional bool video_resolution_constraints = 3 [default = false];
@@ -46,6 +57,12 @@ message ClientIdentification {
     // storing the generation number in secure memory.  For Details, see:
     // https://docs.google.com/document/d/1Mm8oB51SYAgry62mEuh_2OEkabikBiS61kN7HsDnh9Y/edit#heading=h.xgjl2srtytjt
     optional bool anti_rollback_usage_table = 6 [default = false];
+    // The client shall report |srm_version| if available.
+    optional uint32 srm_version = 7;
+    // A device may have SRM data, and report a version, but may not be capable
+    // of updating SRM data.
+    optional bool can_update_srm = 8 [default = false];
+    repeated CertificateKeyType supported_certificate_key_type = 9;
   }
 
   // Type of factory-provisioned device root of trust. Optional.
@@ -68,9 +85,9 @@ message ClientIdentification {
 // EncryptedClientIdentification message used to hold ClientIdentification
 // messages encrypted for privacy purposes.
 message EncryptedClientIdentification {
-  // Service ID for which the ClientIdentifcation is encrypted (owner of service
-  // certificate).
-  optional string service_id = 1;
+  // Provider ID for which the ClientIdentifcation is encrypted (owner of
+  // service certificate).
+  optional string provider_id = 1;
   // Serial number for the service certificate for which ClientIdentification is
   // encrypted.
   optional bytes service_certificate_serial_number = 2;

protos/public/provisioned_device_info.proto

@@ -1,3 +1,11 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2016 Google Inc.
+//
+// This software is licensed under the terms defined in the Widevine Master
+// License Agreement. For a copy of this agreement, please contact
+// widevine-licensing@google.com.
+////////////////////////////////////////////////////////////////////////////////
+
 // Description:
 //   Provisioned device info format definitions.
 

protos/public/signed_device_certificate.proto

@@ -1,3 +1,11 @@
+////////////////////////////////////////////////////////////////////////////////
+// Copyright 2016 Google Inc.
+//
+// This software is licensed under the terms defined in the Widevine Master
+// License Agreement. For a copy of this agreement, please contact
+// widevine-licensing@google.com.
+////////////////////////////////////////////////////////////////////////////////
+
 // Signed device certificate definition.
 
 syntax = "proto2";