tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fixed issue converting Asn1 time to posix on 32-bit systems." into main am: 5c7dd08f12

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2977478

Change-Id: Iccb6e200122de6c79581ba6bf19b9ca9d6264973
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-02-27 07:24:25 +00:00 committed by Automerger Merge Worker
commit 1cd5d233b6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
security/keymint/aidl/vts/functional/KeyMintTest.cpp
View file

@ -1086,6 +1086,7 @@ TEST_P(NewKeyGenerationTest, RsaWithSpecifiedValidity) {
};
for (auto notBefore : test_vector_not_before_millis) {
uint64_t notAfter = notBefore + 378691200000 /* 12 years milliseconds*/;
SCOPED_TRACE(testing::Message() << "notBefore: " << notBefore << " notAfter: " << notAfter);
ASSERT_EQ(ErrorCode::OK,
GenerateKey(AuthorizationSetBuilder()
.RsaSigningKey(2048, 65537)
@ -1101,14 +1102,14 @@ TEST_P(NewKeyGenerationTest, RsaWithSpecifiedValidity) {
const ASN1_TIME* not_before = X509_get0_notBefore(cert.get());
ASSERT_NE(not_before, nullptr);
time_t not_before_time;
ASSERT_EQ(ASN1_TIME_to_time_t(not_before, &not_before_time), 1);
int64_t not_before_time;
ASSERT_EQ(ASN1_TIME_to_posix(not_before, &not_before_time), 1);
EXPECT_EQ(not_before_time, (notBefore / 1000));
const ASN1_TIME* not_after = X509_get0_notAfter(cert.get());
ASSERT_NE(not_after, nullptr);
time_t not_after_time;
ASSERT_EQ(ASN1_TIME_to_time_t(not_after, &not_after_time), 1);
int64_t not_after_time;
ASSERT_EQ(ASN1_TIME_to_posix(not_after, &not_after_time), 1);
EXPECT_EQ(not_after_time, (notAfter / 1000));
}
}