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

Merge "Update padding scheme in mock" into mnc-dev

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2015-05-22 01:14:53 +00:00
committed by Android (Google) Code Review
parent ce68b8ee88 6639965d30
commit 3a7ef26375
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.cpp
View File

@@ -429,6 +429,7 @@ bool SessionContext::GenerateRSASignature(const uint8_t* message,
return false; return false;
} }
// This is the standard padding scheme used for license requests.
if (padding_scheme == kSign_RSASSA_PSS) { if (padding_scheme == kSign_RSASSA_PSS) {
// Hash the message using SHA1. // Hash the message using SHA1.
uint8_t hash[SHA_DIGEST_LENGTH]; uint8_t hash[SHA_DIGEST_LENGTH];
@@ -440,8 +441,9 @@ bool SessionContext::GenerateRSASignature(const uint8_t* message,
// Add PSS padding. // Add PSS padding.
std::vector<uint8_t> padded_digest(*signature_length); std::vector<uint8_t> padded_digest(*signature_length);
int status = RSA_padding_add_PKCS1_PSS(rsa_key_, &padded_digest[0], hash, int status = RSA_padding_add_PKCS1_PSS_mgf1(rsa_key_, &padded_digest[0],
EVP_sha1(), kPssSaltLength); hash, EVP_sha1(), NULL,
kPssSaltLength);
if (status == -1) { if (status == -1) {
LOGE("[GeneratRSASignature(): error padding hash.]"); LOGE("[GeneratRSASignature(): error padding hash.]");
dump_openssl_error(); dump_openssl_error();
@@ -456,6 +458,7 @@ bool SessionContext::GenerateRSASignature(const uint8_t* message,
dump_openssl_error(); dump_openssl_error();
return false; return false;
} }
// This is the alternate padding scheme used by cast receivers only.
} else if (padding_scheme == kSign_PKCS1_Block1) { } else if (padding_scheme == kSign_PKCS1_Block1) {
if (message_length > 83) { if (message_length > 83) {
LOGE("[GeneratRSASignature(): RSA digest too large.]"); LOGE("[GeneratRSASignature(): RSA digest too large.]");

2
libwvdrmengine/oemcrypto/mock/src/oemcrypto_engine_mock.h
View File

@@ -265,9 +265,9 @@ class CryptoEngine {
ActiveSessions sessions_; ActiveSessions sessions_;
WvKeybox keybox_; WvKeybox keybox_;
WvTestKeybox test_keybox_; WvTestKeybox test_keybox_;
bool use_test_keybox_;
wvcdm::Lock session_table_lock_; wvcdm::Lock session_table_lock_;
UsageTable* usage_table_; UsageTable* usage_table_;
bool use_test_keybox_;
RSA* rsa_key_; // If no keybox, this is baked in certificate. RSA* rsa_key_; // If no keybox, this is baked in certificate.
CORE_DISALLOW_COPY_AND_ASSIGN(CryptoEngine); CORE_DISALLOW_COPY_AND_ASSIGN(CryptoEngine);