Source release 18.1.0

platforms/example/no_oemcrypto.cpp

@@ -141,15 +141,17 @@ OEMCryptoResult OEMCrypto_QueryKeyControl(
   return OEMCrypto_ERROR_NOT_IMPLEMENTED;
 }
 
-OEMCryptoResult OEMCrypto_SelectKey(OEMCrypto_SESSION session UNUSED,
-                                    const uint8_t* content_key_id UNUSED,
-                                    size_t content_key_id_length UNUSED,
-                                    OEMCryptoCipherMode cipher_mode UNUSED) {
+OEMCryptoResult OEMCrypto_GetKeyHandle(OEMCrypto_SESSION session UNUSED,
+                                       const uint8_t* content_key_id UNUSED,
+                                       size_t content_key_id_length UNUSED,
+                                       OEMCryptoCipherMode cipher_mode UNUSED,
+                                       uint8_t* key_handle UNUSED,
+                                       size_t* key_handle_length UNUSED) {
   return OEMCrypto_ERROR_NOT_IMPLEMENTED;
 }
 
 OEMCryptoResult OEMCrypto_DecryptCENC(
-    OEMCrypto_SESSION session UNUSED,
+    const uint8_t* key_handle UNUSED, size_t key_handle_length UNUSED,
     const OEMCrypto_SampleDescription* samples UNUSED,
     size_t samples_length UNUSED,
     const OEMCrypto_CENCEncryptPatternDesc* pattern UNUSED) {
@@ -166,7 +168,7 @@ OEMCryptoResult OEMCrypto_CopyBuffer(
 }
 
 OEMCryptoResult OEMCrypto_Generic_Encrypt(
-    OEMCrypto_SESSION session UNUSED,
+    const uint8_t* key_handle UNUSED, size_t key_handle_length UNUSED,
     const OEMCrypto_SharedMemory* in_buffer UNUSED,
     size_t in_buffer_length UNUSED, const uint8_t* iv UNUSED,
     OEMCrypto_Algorithm algorithm UNUSED,
@@ -175,7 +177,7 @@ OEMCryptoResult OEMCrypto_Generic_Encrypt(
 }
 
 OEMCryptoResult OEMCrypto_Generic_Decrypt(
-    OEMCrypto_SESSION session UNUSED,
+    const uint8_t* key_handle UNUSED, size_t key_handle_length UNUSED,
     const OEMCrypto_SharedMemory* in_buffer UNUSED,
     size_t in_buffer_length UNUSED, const uint8_t* iv UNUSED,
     OEMCrypto_Algorithm algorithm UNUSED,
@@ -184,7 +186,7 @@ OEMCryptoResult OEMCrypto_Generic_Decrypt(
 }
 
 OEMCryptoResult OEMCrypto_Generic_Sign(
-    OEMCrypto_SESSION session UNUSED,
+    const uint8_t* key_handle UNUSED, size_t key_handle_length UNUSED,
     const OEMCrypto_SharedMemory* buffer UNUSED, size_t buffer_length UNUSED,
     OEMCrypto_Algorithm algorithm UNUSED,
     OEMCrypto_SharedMemory* signature UNUSED, size_t* signature_length UNUSED) {
@@ -192,7 +194,7 @@ OEMCryptoResult OEMCrypto_Generic_Sign(
 }
 
 OEMCryptoResult OEMCrypto_Generic_Verify(
-    OEMCrypto_SESSION session UNUSED,
+    const uint8_t* key_handle UNUSED, size_t key_handle_length UNUSED,
     const OEMCrypto_SharedMemory* buffer UNUSED, size_t buffer_length UNUSED,
     OEMCrypto_Algorithm algorithm UNUSED,
     const OEMCrypto_SharedMemory* signature UNUSED,
@@ -308,6 +310,12 @@ OEMCrypto_WatermarkingSupport OEMCrypto_GetWatermarkingSupport(void) {
   return OEMCrypto_WatermarkingError;
 }
 
+OEMCryptoResult OEMCrypto_GetSignatureHashAlgorithm(
+    OEMCrypto_SESSION session UNUSED,
+    OEMCrypto_SignatureHashAlgorithm* algorithm UNUSED) {
+  return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+}
+
 OEMCryptoResult OEMCrypto_LoadProvisioning(
     OEMCrypto_SESSION session UNUSED, const uint8_t* message UNUSED,
     size_t message_length UNUSED, size_t core_message_length UNUSED,
@@ -493,3 +501,25 @@ OEMCryptoResult OEMCrypto_GetOEMKeyToken(OEMCrypto_SESSION key_session UNUSED,
                                          size_t* key_token_length UNUSED) {
   return OEMCrypto_ERROR_NOT_IMPLEMENTED;
 }
+
+OEMCryptoResult OEMCrypto_GetDeviceInformation(
+    uint8_t* device_info UNUSED, size_t* device_info_length UNUSED) {
+  return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+}
+
+OEMCryptoResult OEMCrypto_GetDeviceSignedCsrPayload(
+    const uint8_t* challenge UNUSED, size_t challenge_length UNUSED,
+    const uint8_t* encoded_device_info UNUSED,
+    size_t encoded_device_info_length UNUSED,
+    uint8_t* signed_csr_payload UNUSED,
+    size_t* signed_csr_payload_length UNUSED) {
+  return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+}
+
+OEMCryptoResult OEMCrypto_SetMaxAPIVersion(uint32_t max_version UNUSED) {
+  return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+}
+
+OEMCryptoResult OEMCrypto_EnterTestMode(void) {
+  return OEMCrypto_ERROR_NOT_IMPLEMENTED;
+}

platforms/example/settings.gypi

@@ -42,8 +42,8 @@
     ],
     # These are flags passed to the compiler for C++ only.
     'cflags_cc': [
-      # Compile using the C++11 standard.
-      '-std=c++11',
+      # Compile using the C++14 standard.
+      '-std=c++14',
       # CE CDM does not use exceptions or RTTI.
       '-fno-exceptions',
       '-fno-rtti',