Source release v3.3.0
This commit is contained in:
@@ -243,7 +243,7 @@ TEST_F(OEMCryptoClientTest, GetRandomLargeBuffer) {
|
||||
// We don't have enough data to see that the data is really random,
|
||||
// so we'll just do a spot check that two calls don't return the same values.
|
||||
int count = 0;
|
||||
for (int i = 0; i < size; i++) {
|
||||
for (size_t i = 0; i < size; i++) {
|
||||
if (data1[i] == data2[i]) count++;
|
||||
}
|
||||
ASSERT_LE(count, 3); // P(count > 3) = 1/256^3 = 6e-8.
|
||||
@@ -471,7 +471,7 @@ TEST_F(OEMCryptoKeyboxTest, GenerateDerivedKeysFromKeyboxLargeBuffer) {
|
||||
vector<uint8_t> mac_context(kMaxMessageSize);
|
||||
vector<uint8_t> enc_context(kMaxMessageSize);
|
||||
// Stripe the data so the two vectors are not identical, and not all zeroes.
|
||||
for (int i = 0; i < kMaxMessageSize; i++) {
|
||||
for (size_t i = 0; i < kMaxMessageSize; i++) {
|
||||
mac_context[i] = i % 0x100;
|
||||
enc_context[i] = (3 * i) % 0x100;
|
||||
}
|
||||
@@ -554,7 +554,6 @@ TEST_F(OEMCryptoProv30Test, OEMCertSignatureLargeBuffer) {
|
||||
ASSERT_NO_FATAL_FAILURE(s.LoadOEMCert());
|
||||
OEMCryptoResult sts;
|
||||
// Sign a Message
|
||||
static size_t kMaxMessageSize = 8 * 1024;
|
||||
vector<uint8_t> data(kMaxMessageSize);
|
||||
RAND_pseudo_bytes(&data[0], data.size());
|
||||
size_t signature_length = 0;
|
||||
@@ -889,7 +888,7 @@ TEST_F(OEMCryptoSessionTests, ClientSignatureLargeBuffer) {
|
||||
ASSERT_NO_FATAL_FAILURE(s.LoadTestKeys("", false));
|
||||
|
||||
vector<uint8_t> context(kMaxMessageSize);
|
||||
for (int i = 0; i < kMaxMessageSize; i++) {
|
||||
for (size_t i = 0; i < kMaxMessageSize; i++) {
|
||||
context[i] = i % 0x100;
|
||||
}
|
||||
static const uint32_t SignatureBufferMaxLength = 256;
|
||||
@@ -1117,7 +1116,7 @@ class SessionTestAlternateVerification : public OEMCryptoSessionTests,
|
||||
target_api_ = GetParam();
|
||||
}
|
||||
protected:
|
||||
int target_api_;
|
||||
uint32_t target_api_;
|
||||
};
|
||||
|
||||
TEST_P(SessionTestAlternateVerification, LoadKeys) {
|
||||
@@ -1259,19 +1258,21 @@ TEST_F(OEMCryptoSessionTests, AntiRollbackHardwareRequired) {
|
||||
TEST_F(OEMCryptoSessionTests, CheckMinimumPatchLevel) {
|
||||
uint8_t patch_level = OEMCrypto_Security_Patch_Level();
|
||||
printf(" Current Patch Level: %u.\n", patch_level);
|
||||
Session s;
|
||||
ASSERT_NO_FATAL_FAILURE(s.open());
|
||||
ASSERT_NO_FATAL_FAILURE(InstallTestSessionKeys(&s));
|
||||
ASSERT_NO_FATAL_FAILURE(s.FillSimpleMessage(
|
||||
0, patch_level << wvoec_mock::kControlSecurityPatchLevelShift, 0));
|
||||
ASSERT_NO_FATAL_FAILURE(s.EncryptAndSign());
|
||||
ASSERT_EQ(
|
||||
OEMCrypto_SUCCESS,
|
||||
OEMCrypto_LoadKeys(s.session_id(), s.message_ptr(), s.message_size(),
|
||||
&s.signature()[0], s.signature().size(),
|
||||
s.encrypted_license().mac_key_iv,
|
||||
s.encrypted_license().mac_keys, s.num_keys(),
|
||||
s.key_array(), NULL, 0));
|
||||
{
|
||||
Session s;
|
||||
ASSERT_NO_FATAL_FAILURE(s.open());
|
||||
ASSERT_NO_FATAL_FAILURE(InstallTestSessionKeys(&s));
|
||||
ASSERT_NO_FATAL_FAILURE(s.FillSimpleMessage(
|
||||
0, patch_level << wvoec_mock::kControlSecurityPatchLevelShift, 0));
|
||||
ASSERT_NO_FATAL_FAILURE(s.EncryptAndSign());
|
||||
ASSERT_EQ(
|
||||
OEMCrypto_SUCCESS,
|
||||
OEMCrypto_LoadKeys(s.session_id(), s.message_ptr(), s.message_size(),
|
||||
&s.signature()[0], s.signature().size(),
|
||||
s.encrypted_license().mac_key_iv,
|
||||
s.encrypted_license().mac_keys, s.num_keys(),
|
||||
s.key_array(), NULL, 0));
|
||||
}
|
||||
if (patch_level < 0x3F) {
|
||||
Session s;
|
||||
ASSERT_NO_FATAL_FAILURE(s.open());
|
||||
@@ -1314,7 +1315,7 @@ TEST_F(OEMCryptoSessionTests, Minimum20Keys) {
|
||||
ASSERT_NO_FATAL_FAILURE(s.FillSimpleMessage(0, 0, 0));
|
||||
ASSERT_NO_FATAL_FAILURE(s.EncryptAndSign());
|
||||
ASSERT_NO_FATAL_FAILURE(s.LoadTestKeys());
|
||||
for (int key_index = 0; key_index < kMaxNumKeys; key_index++) {
|
||||
for (size_t key_index = 0; key_index < kMaxNumKeys; key_index++) {
|
||||
bool kSelectKeyFirst = true;
|
||||
ASSERT_NO_FATAL_FAILURE(
|
||||
s.TestDecryptCTR(kSelectKeyFirst, OEMCrypto_SUCCESS, key_index));
|
||||
@@ -1633,7 +1634,7 @@ class OEMCryptoSessionTestsDecryptTests
|
||||
// Partial block. Don't increment iv. Compute next block offset.
|
||||
block_offset = block_offset + size;
|
||||
} else {
|
||||
EXPECT_EQ(AES_BLOCK_SIZE, block_offset + size);
|
||||
EXPECT_EQ((size_t)AES_BLOCK_SIZE, block_offset + size);
|
||||
// Full block. Increment iv, and set offset to 0 for next block.
|
||||
ctr128_inc64(1, iv);
|
||||
block_offset = 0;
|
||||
@@ -2614,7 +2615,7 @@ TEST_F(OEMCryptoUsesCertificate, GenerateDerivedKeysLargeBuffer) {
|
||||
vector<uint8_t> mac_context(kMaxMessageSize);
|
||||
vector<uint8_t> enc_context(kMaxMessageSize);
|
||||
// Stripe the data so the two vectors are not identical, and not all zeroes.
|
||||
for (int i = 0; i < kMaxMessageSize; i++) {
|
||||
for (size_t i = 0; i < kMaxMessageSize; i++) {
|
||||
mac_context[i] = i % 0x100;
|
||||
enc_context[i] = (3 * i) % 0x100;
|
||||
}
|
||||
@@ -4212,14 +4213,14 @@ class GenericCryptoKeyIdLengthTest : public GenericCryptoTest {
|
||||
|
||||
// Make all four keys have the same length.
|
||||
void SetUniformKeyIdLength(size_t key_id_length) {
|
||||
for (unsigned int i = 0; i < session_.num_keys(); i++) {
|
||||
for (int i = 0; i < session_.num_keys(); i++) {
|
||||
string key_id;
|
||||
key_id.resize(key_id_length, i + 'a');
|
||||
session_.SetKeyId(i, key_id);
|
||||
}
|
||||
}
|
||||
|
||||
void TestWithKey(unsigned int key_index) {
|
||||
void TestWithKey(int key_index) {
|
||||
ASSERT_LT(key_index, session_.num_keys());
|
||||
EncryptAndLoadKeys();
|
||||
vector<uint8_t> encrypted;
|
||||
@@ -5486,7 +5487,7 @@ TEST_F(UsageTableTest, LoadSharedLicense) {
|
||||
ASSERT_NO_FATAL_FAILURE(s.LoadTestKeys(pst, true));
|
||||
ASSERT_NO_FATAL_FAILURE(s.FillSimpleMessage(0, 0, 0));
|
||||
// The second set of keys are not loaded.
|
||||
for (unsigned int i = 0; i < s.num_keys(); i++) {
|
||||
for (int i = 0; i < s.num_keys(); i++) {
|
||||
memset(s.license().keys[i].key_id, 'A' + i,
|
||||
s.license().keys[i].key_id_length);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user