widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix OpenSSL Builds"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-10-28 21:47:37 +00:00
committed by Android (Google) Code Review
parent 43f6d79ffa 0f2a4a40dc
commit 712784055b
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libwvdrmengine/cdm/core/src/privacy_crypto_boringssl.cpp
View File

@@ -336,11 +336,12 @@ bool ExtractExtensionValueFromCertificate(const std::string& cert,
STACK_OF(X509)* certs = pkcs7->d.sign->cert; STACK_OF(X509)* certs = pkcs7->d.sign->cert;
// Find the desired certificate from the stack. // Find the desired certificate from the stack.
if (cert_index >= static_cast<size_t>(sk_X509_num(certs))) { const size_t num_certs = static_cast<size_t>(sk_X509_num(certs));
if (cert_index >= num_certs) {
LOGE( LOGE(
"Unexpected number of certificates in chain: " "Unexpected number of certificates in chain: "
"count = %zu, minimum = %zu", "count = %zu, minimum = %zu",
sk_X509_num(certs), cert_index + 1); num_certs, cert_index + 1);
return false; return false;
} }

1
libwvdrmengine/oemcrypto/ref/src/oemcrypto_usage_table_ref.h
View File

@@ -9,6 +9,7 @@
#include <stdint.h> #include <stdint.h>
#include <map> #include <map>
#include <memory>
#include <string> #include <string>
#include <vector> #include <vector>