Source release 19.4.0

core/include/crypto_session.h

@@ -99,6 +99,13 @@ class CryptoSession {
   virtual CdmResponseType GetProvisioning40TokenType(
       OEMCrypto_BCCType* bcc_type);
 
+  virtual CdmResponseType GetProvisioning40TokenSignatureType(
+      RequestedSecurityLevel requested_security_level,
+      OEMCrypto_BCCSignatureType* bcc_signature_type);
+  // Must be called after session is open.
+  virtual CdmResponseType GetProvisioning40TokenSignatureType(
+      OEMCrypto_BCCSignatureType* bcc_signature_type);
+
   virtual CdmClientTokenType GetPreProvisionTokenType() {
     return pre_provision_token_type_;
   }
@@ -213,6 +220,11 @@ class CryptoSession {
       std::string* additional_signature);
   virtual CdmResponseType GetBootCertificateChain(
       std::string* bcc, std::string* additional_signature);
+  virtual CdmResponseType GetBootCertificateChainSignatureType(
+      RequestedSecurityLevel requested_security_level,
+      OEMCrypto_BCCSignatureType* bcc_signature_type);
+  virtual CdmResponseType GetBootCertificateChainSignatureType(
+      OEMCrypto_BCCSignatureType* bcc_signature_type);
   virtual CdmResponseType GetDeviceInformation(
       RequestedSecurityLevel requested_security_level,
       std::string* device_info);
@@ -494,12 +506,12 @@ class CryptoSession {
   // otherwise, such as making two calls into OEMCrypto immediately after each
   // other.
   template <class Func>
-  static auto WithStaticFieldWriteLock(const char* tag,
-                                       Func body) -> decltype(body());
+  static auto WithStaticFieldWriteLock(const char* tag, Func body)
+      -> decltype(body());
 
   template <class Func>
-  static auto WithStaticFieldReadLock(const char* tag,
-                                      Func body) -> decltype(body());
+  static auto WithStaticFieldReadLock(const char* tag, Func body)
+      -> decltype(body());
 
   template <class Func>
   static auto WithOecWriteLock(const char* tag, Func body) -> decltype(body());