identity: VTS: allow for multiple interpretations of AuthKey validity. am: a6fc69d339 am: 8a497eec46

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

Change-Id: I2ea8de0cb7f2df5a466b2e8f2985fd82436997f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
David Zeuthen 2023-03-13 22:22:40 +00:00 committed by Automerger Merge Worker
commit e8d693aea2

View file

@ -523,8 +523,24 @@ void verifyAuthKeyCertificate(const vector<uint8_t>& authKeyCertChain) {
int64_t allowDriftSecs = 10;
EXPECT_LE(-allowDriftSecs, diffSecs);
EXPECT_GE(allowDriftSecs, diffSecs);
constexpr uint64_t kSecsInOneYear = 365 * 24 * 60 * 60;
EXPECT_EQ(notBefore + kSecsInOneYear, notAfter);
// The AIDL spec used to call for "one year in the future (365
// days)" but was updated to say "current time and 31536000
// seconds in the future (approximately 365 days)" to clarify that
// this was the original intention.
//
// However a number of implementations interpreted this as a
// "literal year" which started causing problems in March 2023
// because 2024 is a leap year. Since the extra day doesn't really
// matter (the validity period is specified in the MSO anyway and
// that's what RPs use), we allow both interpretations.
//
// For simplicity, we just require that that notAfter is after
// 31536000 and which also covers the case if there's a leap-day
// and possible leap-seconds.
//
constexpr uint64_t kSecsIn365Days = 365 * 24 * 60 * 60;
EXPECT_LE(notBefore + kSecsIn365Days, notAfter);
}
vector<RequestNamespace> buildRequestNamespaces(const vector<TestEntryData> entries) {