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

Snap for 4560043 from c58a0c62fe to pi-release

Browse Source 
Change-Id: I1be55aa7d5317133c224f96b23a7c28ca0942e8e
This commit is contained in:
android-build-team Robot
2018-01-23 08:25:05 +00:00
parent 84b8352233 c58a0c62fe
commit 5ce0d9a365
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -579,20 +579,24 @@ TEST_F(OEMCryptoProv30Test, OEMCertForbiddenPaddingScheme) {
vector<uint8_t> data(500); vector<uint8_t> data(500);
GetRandBytes(&data[0], data.size()); GetRandBytes(&data[0], data.size());
size_t signature_length = 0; size_t signature_length = 0;
vector<uint8_t> signature(1); // We need a size one vector to pass as a pointer.
vector<uint8_t> signature(1, 0);
vector<uint8_t> zero(1, 0);
sts = OEMCrypto_GenerateRSASignature(s.session_id(), &data[0], data.size(), sts = OEMCrypto_GenerateRSASignature(s.session_id(), &data[0], data.size(),
&signature[0], &signature_length, &signature[0], &signature_length,
kSign_PKCS1_Block1); kSign_PKCS1_Block1);
if (OEMCrypto_ERROR_SHORT_BUFFER == sts) { if (OEMCrypto_ERROR_SHORT_BUFFER == sts) {
// The OEMCrypto could complain about buffer length first, so let's
// resize and check if it's writing to the signature again.
signature.resize(signature_length, 0); signature.resize(signature_length, 0);
zero.resize(signature_length, 0);
sts = OEMCrypto_GenerateRSASignature(s.session_id(), &data[0], data.size(), sts = OEMCrypto_GenerateRSASignature(s.session_id(), &data[0], data.size(),
&signature[0], &signature_length, &signature[0], &signature_length,
kSign_PKCS1_Block1); kSign_PKCS1_Block1);
} }
EXPECT_NE(OEMCrypto_SUCCESS, sts) EXPECT_NE(OEMCrypto_SUCCESS, sts)
<< "OEM Cert Signed with forbidden kSign_PKCS1_Block1."; << "OEM Cert Signed with forbidden kSign_PKCS1_Block1.";
vector<uint8_t> zero(signature_length, 0);
ASSERT_EQ(zero, signature); // signature should not be computed. ASSERT_EQ(zero, signature); // signature should not be computed.
} }