diff options
| author | James Willcox <jwillcox@google.com> | 2023-11-08 18:47:53 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-11-08 18:47:53 +0000 |
| commit | 5b5890081b08eaba7e89615fc801040eac4f9945 (patch) | |
| tree | 37c826815a0b1bac7c64c46081ecfedf59b3b5b9 | |
| parent | e82faef4b4119a0e0080cba385788a801b2cb746 (diff) | |
| parent | 464c7d3d2b5d182d35335a98513f8e45ef013b5b (diff) | |
| download | security-5b5890081b08eaba7e89615fc801040eac4f9945.tar.gz | |
Merge "Use CLOCK_BOOTTIME for keystore2 auth token received time" into main am: 464c7d3d2b
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2822970
Change-Id: If5a14bee81ca590fcb378357d0487ccbca61dead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore2/src/utils.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/keystore2/src/utils.rs b/keystore2/src/utils.rs index f028491a..4fd9c8dd 100644 --- a/keystore2/src/utils.rs +++ b/keystore2/src/utils.rs @@ -269,7 +269,7 @@ pub fn get_current_time_in_milliseconds() -> i64 { let mut current_time = libc::timespec { tv_sec: 0, tv_nsec: 0 }; // SAFETY: The pointer is valid because it comes from a reference, and clock_gettime doesn't // retain it beyond the call. - unsafe { libc::clock_gettime(libc::CLOCK_MONOTONIC_RAW, &mut current_time) }; + unsafe { libc::clock_gettime(libc::CLOCK_BOOTTIME, &mut current_time) }; current_time.tv_sec as i64 * 1000 + (current_time.tv_nsec as i64 / 1_000_000) } |