From 9d384305b7757266d0a16632438ed6338aeda223 Mon Sep 17 00:00:00 2001 From: "John W. Bruce" Date: Wed, 28 Mar 2018 22:12:30 -0700 Subject: [PATCH] Add widevine.com Default Provisioning Service Certificate (This is a merge from http://go/wvgerrit/46447) The Production Provisioning Service is moving to the "widevine.com" certificate from the "license.widevine.com" certificate it was using. This replaces the two places this certificate appears in the source code. This is expected to be the last such update. Also, the Staging Provisioning Service was already using this certificate, but our code had it listed as using the old certificate. It has also been updated. Bug: 77244492 Test: CE CDM Unit Tests Test: Android Unit Tests Change-Id: I2ce14ea8e672c453ce0f74fbd3345f7e40f2f297 --- .../cdm/core/src/certificate_provisioning.cpp | 45 ++++----- .../cdm/core/test/config_test_env.cpp | 92 ++++++++++--------- 2 files changed, 70 insertions(+), 67 deletions(-) diff --git a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp index 8dcd9afc..d37c603c 100644 --- a/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp +++ b/libwvdrmengine/cdm/core/src/certificate_provisioning.cpp @@ -21,29 +21,30 @@ const std::string kProvisioningServerUrl = "certificateprovisioning/v1/devicecertificates/create" "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE"; -// TODO(b/69133499): update to new default cert. -// NOTE: Provider ID = license.widevine.com +// NOTE: Provider ID = widevine.com const std::string kCpProductionServiceCertificate = wvcdm::a2bs_hex( - "0ac102080312101705b917cc1204868b06333a2f772a8c1882b4829205228e023082010a02" - "8201010099ed5b3b327dab5e24efc3b62a95b598520ad5bccb37503e0645b814d876b8df40" - "510441ad8ce3adb11bb88c4e725a5e4a9e0795291d58584023a7e1af0e38a9127939300861" - "0b6f158c878c7e21bffbfeea77e1019e1e5781e8a45f46263d14e60e8058a8607adce04fac" - "8457b137a8d67ccdeb33705d983a21fb4eecbd4a10ca47490ca47eaa5d438218ddbaf1cade" - "3392f13d6ffb6442fd31e1bf40b0c604d1c4ba4c9520a4bf97eebd60929afceef55bbaf564" - "e2d0e76cd7c55c73a082b996120b8359edce24707082680d6f67c6d82c4ac5f3134490a74e" - "ec37af4b2f010c59e82843e2582f0b6b9f5db0fc5e6edf64fbd308b4711bcf1250019c9f5a" - "0902030100013a146c6963656e73652e7769646576696e652e636f6d128003ae347314b5a8" - "35297f271388fb7bb8cb5277d249823cddd1da30b93339511eb3ccbdea04b944b927c12134" - "6efdbdeac9d413917e6ec176a10438460a503bc1952b9ba4e4ce0fc4bfc20a9808aaaf4bfc" - "d19c1dcfcdf574ccac28d1b410416cf9de8804301cbdb334cafcd0d40978423a642e54613d" - "f0afcf96ca4a9249d855e42b3a703ef1767f6a9bd36d6bf82be76bbf0cba4fde59d2abcc76" - "feb64247b85c431fbca52266b619fc36979543fca9cbbdbbfafa0e1a55e755a3c7bce655f9" - "646f582ab9cf70aa08b979f867f63a0b2b7fdb362c5bc4ecd555d85bcaa9c593c383c857d4" - "9daab77e40b7851ddfd24998808e35b258e75d78eac0ca16f7047304c20d93ede4e8ff1c6f" - "17e6243e3f3da8fc1709870ec45fba823a263f0cefa1f7093b1909928326333705043a29bd" - "a6f9b4342cc8df543cb1a1182f7c5fff33f10490faca5b25360b76015e9c5a06ab8ee02f00" - "d2e8d5986104aacc4dd475fd96ee9ce4e326f21b83c7058577b38732cddabc6a6bed13fb0d" - "49d38a45eb87a5f4"); + "0ab9020803121051434fe2a44c763bcc2c826a2d6ef9a718f7d793d005228e02" + "3082010a02820101009e27088659dbd9126bc6ed594caf652b0eaab82abb9862" + "ada1ee6d2cb5247e94b28973fef5a3e11b57d0b0872c930f351b5694354a8c77" + "ed4ee69834d2630372b5331c5710f38bdbb1ec3024cfadb2a8ac94d977d391b7" + "d87c20c5c046e9801a9bffaf49a36a9ee6c5163eff5cdb63bfc750cf4a218618" + "984e485e23a10f08587ec5d990e9ab0de71460dfc334925f3fb9b55761c61e28" + "8398c387a0925b6e4dcaa1b36228d9feff7e789ba6e5ef6cf3d97e6ae05525db" + "38f826e829e9b8764c9e2c44530efe6943df4e048c3c5900ca2042c5235dc80d" + "443789e734bf8e59a55804030061ed48e7d139b521fbf35524b3000b3e2f6de0" + "001f5eeb99e9ec635f02030100013a0c7769646576696e652e636f6d12800332" + "2c2f3fedc47f8b7ba88a135a355466e378ed56a6fc29ce21f0cafc7fb253b073" + "c55bed253d8650735417aad02afaefbe8d5687902b56a164490d83d590947515" + "68860e7200994d322b5de07f82ef98204348a6c2c9619092340eb87df26f63bf" + "56c191dc069b80119eb3060d771afaaeb2d30b9da399ef8a41d16f45fd121e09" + "a0c5144da8f8eb46652c727225537ad65e2a6a55799909bbfb5f45b5775a1d1e" + "ac4e06116c57adfa9ce0672f19b70b876f88e8b9fbc4f96ccc500c676cfb173c" + "b6f52601573e2e45af1d9d2a17ef1487348c05cfc6d638ec2cae3fadb655e943" + "1330a75d2ceeaa54803e371425111e20248b334a3a50c8eca683c448b8ac402c" + "76e6f76e2751fbefb669f05703cec8c64cf7a62908d5fb870375eb0cc96c508e" + "26e0c050f3fd3ebe68cef9903ef6405b25fc6e31f93559fcff05657662b3653a" + "8598ed5751b38694419242a875d9e00d5a5832933024b934859ec8be78adccbb" + "1ec7127ae9afeef9c5cd2e15bd3048e8ce652f7d8c5d595a0323238c598a28"); /* * Provisioning response is a base64-encoded protobuf, optionally within a diff --git a/libwvdrmengine/cdm/core/test/config_test_env.cpp b/libwvdrmengine/cdm/core/test/config_test_env.cpp index d24b8686..e1179ad6 100644 --- a/libwvdrmengine/cdm/core/test/config_test_env.cpp +++ b/libwvdrmengine/cdm/core/test/config_test_env.cpp @@ -24,59 +24,61 @@ const std::string kCpProductionProvisioningServerUrl = "https://www.googleapis.com/" "certificateprovisioning/v1/devicecertificates/create" "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE"; -// TODO(b/69133499): update to new default cert. -// NOTE: Provider ID = license.widevine.com +// NOTE: Provider ID = widevine.com const std::string kCpProductionProvisioningServiceCertificate = - "0ac102080312101705b917cc1204868b06333a2f772a8c1882b4829205228e023082010a02" - "8201010099ed5b3b327dab5e24efc3b62a95b598520ad5bccb37503e0645b814d876b8df40" - "510441ad8ce3adb11bb88c4e725a5e4a9e0795291d58584023a7e1af0e38a9127939300861" - "0b6f158c878c7e21bffbfeea77e1019e1e5781e8a45f46263d14e60e8058a8607adce04fac" - "8457b137a8d67ccdeb33705d983a21fb4eecbd4a10ca47490ca47eaa5d438218ddbaf1cade" - "3392f13d6ffb6442fd31e1bf40b0c604d1c4ba4c9520a4bf97eebd60929afceef55bbaf564" - "e2d0e76cd7c55c73a082b996120b8359edce24707082680d6f67c6d82c4ac5f3134490a74e" - "ec37af4b2f010c59e82843e2582f0b6b9f5db0fc5e6edf64fbd308b4711bcf1250019c9f5a" - "0902030100013a146c6963656e73652e7769646576696e652e636f6d128003ae347314b5a8" - "35297f271388fb7bb8cb5277d249823cddd1da30b93339511eb3ccbdea04b944b927c12134" - "6efdbdeac9d413917e6ec176a10438460a503bc1952b9ba4e4ce0fc4bfc20a9808aaaf4bfc" - "d19c1dcfcdf574ccac28d1b410416cf9de8804301cbdb334cafcd0d40978423a642e54613d" - "f0afcf96ca4a9249d855e42b3a703ef1767f6a9bd36d6bf82be76bbf0cba4fde59d2abcc76" - "feb64247b85c431fbca52266b619fc36979543fca9cbbdbbfafa0e1a55e755a3c7bce655f9" - "646f582ab9cf70aa08b979f867f63a0b2b7fdb362c5bc4ecd555d85bcaa9c593c383c857d4" - "9daab77e40b7851ddfd24998808e35b258e75d78eac0ca16f7047304c20d93ede4e8ff1c6f" - "17e6243e3f3da8fc1709870ec45fba823a263f0cefa1f7093b1909928326333705043a29bd" - "a6f9b4342cc8df543cb1a1182f7c5fff33f10490faca5b25360b76015e9c5a06ab8ee02f00" - "d2e8d5986104aacc4dd475fd96ee9ce4e326f21b83c7058577b38732cddabc6a6bed13fb0d" - "49d38a45eb87a5f4"; + "0ab9020803121051434fe2a44c763bcc2c826a2d6ef9a718f7d793d005228e02" + "3082010a02820101009e27088659dbd9126bc6ed594caf652b0eaab82abb9862" + "ada1ee6d2cb5247e94b28973fef5a3e11b57d0b0872c930f351b5694354a8c77" + "ed4ee69834d2630372b5331c5710f38bdbb1ec3024cfadb2a8ac94d977d391b7" + "d87c20c5c046e9801a9bffaf49a36a9ee6c5163eff5cdb63bfc750cf4a218618" + "984e485e23a10f08587ec5d990e9ab0de71460dfc334925f3fb9b55761c61e28" + "8398c387a0925b6e4dcaa1b36228d9feff7e789ba6e5ef6cf3d97e6ae05525db" + "38f826e829e9b8764c9e2c44530efe6943df4e048c3c5900ca2042c5235dc80d" + "443789e734bf8e59a55804030061ed48e7d139b521fbf35524b3000b3e2f6de0" + "001f5eeb99e9ec635f02030100013a0c7769646576696e652e636f6d12800332" + "2c2f3fedc47f8b7ba88a135a355466e378ed56a6fc29ce21f0cafc7fb253b073" + "c55bed253d8650735417aad02afaefbe8d5687902b56a164490d83d590947515" + "68860e7200994d322b5de07f82ef98204348a6c2c9619092340eb87df26f63bf" + "56c191dc069b80119eb3060d771afaaeb2d30b9da399ef8a41d16f45fd121e09" + "a0c5144da8f8eb46652c727225537ad65e2a6a55799909bbfb5f45b5775a1d1e" + "ac4e06116c57adfa9ce0672f19b70b876f88e8b9fbc4f96ccc500c676cfb173c" + "b6f52601573e2e45af1d9d2a17ef1487348c05cfc6d638ec2cae3fadb655e943" + "1330a75d2ceeaa54803e371425111e20248b334a3a50c8eca683c448b8ac402c" + "76e6f76e2751fbefb669f05703cec8c64cf7a62908d5fb870375eb0cc96c508e" + "26e0c050f3fd3ebe68cef9903ef6405b25fc6e31f93559fcff05657662b3653a" + "8598ed5751b38694419242a875d9e00d5a5832933024b934859ec8be78adccbb" + "1ec7127ae9afeef9c5cd2e15bd3048e8ce652f7d8c5d595a0323238c598a28"; // Staging Provisioning Server const std::string kCpStagingProvisioningServerUrl = "https://staging-www.sandbox.googleapis.com/" "certificateprovisioning/v1/devicecertificates/create" "?key=AIzaSyB-5OLKTx2iU5mko18DfdwK5611JIjbUhE"; -// TODO(b/69133499): update to new default cert. -// NOTE: This is currently the same as the Production Service Cert. -// NOTE: Provider ID = license.widevine.com +// NOTE: This is currently the same as the Production Provisioning Service Cert. +// NOTE: Provider ID = widevine.com const std::string kCpStagingProvisioningServiceCertificate = - "0ac102080312101705b917cc1204868b06333a2f772a8c1882b4829205228e023082010a02" - "8201010099ed5b3b327dab5e24efc3b62a95b598520ad5bccb37503e0645b814d876b8df40" - "510441ad8ce3adb11bb88c4e725a5e4a9e0795291d58584023a7e1af0e38a9127939300861" - "0b6f158c878c7e21bffbfeea77e1019e1e5781e8a45f46263d14e60e8058a8607adce04fac" - "8457b137a8d67ccdeb33705d983a21fb4eecbd4a10ca47490ca47eaa5d438218ddbaf1cade" - "3392f13d6ffb6442fd31e1bf40b0c604d1c4ba4c9520a4bf97eebd60929afceef55bbaf564" - "e2d0e76cd7c55c73a082b996120b8359edce24707082680d6f67c6d82c4ac5f3134490a74e" - "ec37af4b2f010c59e82843e2582f0b6b9f5db0fc5e6edf64fbd308b4711bcf1250019c9f5a" - "0902030100013a146c6963656e73652e7769646576696e652e636f6d128003ae347314b5a8" - "35297f271388fb7bb8cb5277d249823cddd1da30b93339511eb3ccbdea04b944b927c12134" - "6efdbdeac9d413917e6ec176a10438460a503bc1952b9ba4e4ce0fc4bfc20a9808aaaf4bfc" - "d19c1dcfcdf574ccac28d1b410416cf9de8804301cbdb334cafcd0d40978423a642e54613d" - "f0afcf96ca4a9249d855e42b3a703ef1767f6a9bd36d6bf82be76bbf0cba4fde59d2abcc76" - "feb64247b85c431fbca52266b619fc36979543fca9cbbdbbfafa0e1a55e755a3c7bce655f9" - "646f582ab9cf70aa08b979f867f63a0b2b7fdb362c5bc4ecd555d85bcaa9c593c383c857d4" - "9daab77e40b7851ddfd24998808e35b258e75d78eac0ca16f7047304c20d93ede4e8ff1c6f" - "17e6243e3f3da8fc1709870ec45fba823a263f0cefa1f7093b1909928326333705043a29bd" - "a6f9b4342cc8df543cb1a1182f7c5fff33f10490faca5b25360b76015e9c5a06ab8ee02f00" - "d2e8d5986104aacc4dd475fd96ee9ce4e326f21b83c7058577b38732cddabc6a6bed13fb0d" - "49d38a45eb87a5f4"; + "0ab9020803121051434fe2a44c763bcc2c826a2d6ef9a718f7d793d005228e02" + "3082010a02820101009e27088659dbd9126bc6ed594caf652b0eaab82abb9862" + "ada1ee6d2cb5247e94b28973fef5a3e11b57d0b0872c930f351b5694354a8c77" + "ed4ee69834d2630372b5331c5710f38bdbb1ec3024cfadb2a8ac94d977d391b7" + "d87c20c5c046e9801a9bffaf49a36a9ee6c5163eff5cdb63bfc750cf4a218618" + "984e485e23a10f08587ec5d990e9ab0de71460dfc334925f3fb9b55761c61e28" + "8398c387a0925b6e4dcaa1b36228d9feff7e789ba6e5ef6cf3d97e6ae05525db" + "38f826e829e9b8764c9e2c44530efe6943df4e048c3c5900ca2042c5235dc80d" + "443789e734bf8e59a55804030061ed48e7d139b521fbf35524b3000b3e2f6de0" + "001f5eeb99e9ec635f02030100013a0c7769646576696e652e636f6d12800332" + "2c2f3fedc47f8b7ba88a135a355466e378ed56a6fc29ce21f0cafc7fb253b073" + "c55bed253d8650735417aad02afaefbe8d5687902b56a164490d83d590947515" + "68860e7200994d322b5de07f82ef98204348a6c2c9619092340eb87df26f63bf" + "56c191dc069b80119eb3060d771afaaeb2d30b9da399ef8a41d16f45fd121e09" + "a0c5144da8f8eb46652c727225537ad65e2a6a55799909bbfb5f45b5775a1d1e" + "ac4e06116c57adfa9ce0672f19b70b876f88e8b9fbc4f96ccc500c676cfb173c" + "b6f52601573e2e45af1d9d2a17ef1487348c05cfc6d638ec2cae3fadb655e943" + "1330a75d2ceeaa54803e371425111e20248b334a3a50c8eca683c448b8ac402c" + "76e6f76e2751fbefb669f05703cec8c64cf7a62908d5fb870375eb0cc96c508e" + "26e0c050f3fd3ebe68cef9903ef6405b25fc6e31f93559fcff05657662b3653a" + "8598ed5751b38694419242a875d9e00d5a5832933024b934859ec8be78adccbb" + "1ec7127ae9afeef9c5cd2e15bd3048e8ce652f7d8c5d595a0323238c598a28"; // ----------------------------------------------------------------------------- // Below are several choices for licenseing servers: production, UAT, staging