Source release v3.0.3

core/src/cdm_engine.cpp

@@ -299,12 +299,18 @@ CdmResponseType CdmEngine::AddKey(const CdmSessionId& session_id,
 
   CdmResponseType sts = iter->second->AddKey(key_data, key_set_id);
 
-  if (KEY_ADDED != sts) {
-    LOGE("CdmEngine::AddKey: keys not added, result = %d", sts);
-    return sts;
+  switch (sts) {
+    case KEY_ADDED:
+      break;
+    case NEED_KEY:
+      LOGI("CdmEngine::AddKey: service certificate loaded, no key added");
+      break;
+    default:
+      LOGE("CdmEngine::AddKey: keys not added, result = %d", sts);
+      break;
   }
 
-  return KEY_ADDED;
+  return sts;
 }
 
 CdmResponseType CdmEngine::RestoreKey(const CdmSessionId& session_id,

core/src/privacy_crypto_apple.cpp

@@ -228,6 +228,7 @@ bool PSSVerify(const uint8_t *message, size_t messageLength,
   }
 
   // Verify db
+  dbMask[0] &= 0x7F;
   for (int i = 0; i < dbLength - kPssSaltLength - 1; i++) {
     if (dbMask[i] != 0) {
       return false;