Source release v3.0.5

cdm/cdm.gyp

@@ -13,6 +13,18 @@
     # If set to 'dummy', privacy mode in the CDM will fail.
     'privacy_crypto_impl%': 'openssl',
 
+    # There are two openssl configurations:
+    #
+    # 1) openssl_config == 'system'
+    # Use the openssl headers found in the sysroot and link the system library.
+    #
+    # 2) openssl_config == 'target'
+    # Use the openssl implementation in an existing GYP target.
+    # Specify the openssl target in openssl_target. This target should forward
+    # the include path to its headers to its dependents.
+    'openssl_config%': 'system',
+    'openssl_target%': '',
+
     # There are three protobuf configurations:
     #
     # 1) protobuf_config == 'system'
@@ -136,8 +148,24 @@
             '../core/src/oemcrypto_adapter_static_v10.cpp',
           ],
         }],
-      ],
-    },
+        ['privacy_crypto_impl=="openssl"', {
+          'conditions': [
+            ['openssl_config == "target"', {
+              'dependencies': [
+                '<(openssl_target)',
+              ],
+            }, {
+              # openssl_config == "system"
+              'link_settings': {
+                'libraries': [
+                  '-lcrypto',
+                ],
+              },
+            }],
+          ],  # conditions
+        }],  # privacy_crypto_impl=="openssl"
+      ],  # conditions
+    },  # widevine_cdm_core target
     {
       'target_name': 'widevine_ce_cdm_static',
       'type': 'static_library',
@@ -177,7 +205,7 @@
         'src/log.cpp',
         'src/properties_ce.cpp',
       ],
-    },
+    },  # widevine_cdm_static target
     {
       'target_name': 'widevine_ce_cdm_shared',
       'type': 'shared_library',

cdm/cdm_unittests.gyp

@@ -5,6 +5,8 @@
 {
   'variables': {
     'oemcrypto_lib%': '',
+    'openssl_config%': 'system',
+    'openssl_target%': '',
   },
   'targets': [
     {
@@ -28,8 +30,6 @@
         'cdm_unittests.gypi',
       ],
       'libraries': [
-        '-lcrypto',  # oec_mock
-        '-lssl',  # oec_mock
         '-lpthread',  # gtest
       ],
       'dependencies': [

cdm/cdm_unittests.gypi

@@ -21,4 +21,19 @@
     'UNIT_TEST',
     'CDM_TESTS',
   ],
+  'conditions': [
+    # OpenSSL needed for http_socket
+    ['openssl_config == "target"', {
+      'dependencies': [
+        '<(openssl_target)',
+      ],
+    }, {
+      # openssl_config == "system"
+      'link_settings': {
+        'libraries': [
+          '-lssl',
+        ],
+      },
+    }],
+  ],
 }

cdm/core_unittests.gypi

@@ -33,4 +33,19 @@
     # correct path.
     '<(cdm_dir)/cdm/cdm.gyp:license_protocol',
   ],
+  'conditions': [
+    # OpenSSL needed for http_socket
+    ['openssl_config == "target"', {
+      'dependencies': [
+        '<(openssl_target)',
+      ],
+    }, {
+      # openssl_config == "system"
+      'link_settings': {
+        'libraries': [
+          '-lssl',
+        ],
+      },
+    }],
+  ],
 }

cdm/include/cdm_version.h

@@ -1,2 +1,2 @@
 // Widevine CE CDM Version
-#define CDM_VERSION "v3.0.4-0-g4dee2a8-ce"
+#define CDM_VERSION "v3.0.5-0-g897db53-ce"

cdm/test/cdm_test.cpp

@@ -160,6 +160,13 @@ class CdmTest : public Test,
     SetDefaultServerCertificate();
   }
 
+  virtual void TearDown() OVERRIDE {
+    // So the OEMCrypto nonce flood check does not trigger.
+    // A 500ms delay allows up to 10 nonces to be generated per test without
+    // triggering an OEMCrypto error.
+    usleep(500 * 1000);
+  }
+
   void RecreateCdm(bool privacy_mode) {
     CreateAdditionalCdm(privacy_mode, &cdm_);
   }