diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:20:43 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-04-23 23:20:43 +0000 |
| commit | d2e3b3a1225e76d68a8984c24156e927aafabd3f (patch) | |
| tree | 35107a340e2e48e40c85902610e6ed901e9b7c7b | |
| parent | f37261121d8c7108eba513b79354fe05c6c722e4 (diff) | |
| parent | 4a62b1c3b2c9c2fd98f1c1dd50b6ca4b59686825 (diff) | |
| download | keymaster-sdk-release.tar.gz | |
Snap for 11754915 from 4a62b1c3b2c9c2fd98f1c1dd50b6ca4b59686825 to sdk-releasesdk-release
Change-Id: I107110cd2053c55f5a8b311d71674a77e9b34cff
| -rw-r--r-- | km_openssl/certificate_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/km_openssl/certificate_utils.cpp b/km_openssl/certificate_utils.cpp index 2cbae99..05fc253 100644 --- a/km_openssl/certificate_utils.cpp +++ b/km_openssl/certificate_utils.cpp @@ -271,8 +271,8 @@ keymaster_error_t make_cert_rump(const X509_NAME* issuer, // Set activation date. ASN1_TIME_Ptr notBefore(ASN1_TIME_new()); LOG_D("Setting notBefore to %" PRId64, cert_params.active_date_time / 1000); - time_t notBeforeTime = static_cast<time_t>(cert_params.active_date_time / 1000); - if (!notBefore.get() || !ASN1_TIME_set(notBefore.get(), notBeforeTime) || + int64_t notBeforeTime = cert_params.active_date_time / 1000; + if (!notBefore.get() || !ASN1_TIME_set_posix(notBefore.get(), notBeforeTime) || !X509_set_notBefore(certificate.get(), notBefore.get() /* Don't release; copied */)) { return TranslateLastOpenSslError(); } @@ -280,9 +280,9 @@ keymaster_error_t make_cert_rump(const X509_NAME* issuer, // Set expiration date. ASN1_TIME_Ptr notAfter(ASN1_TIME_new()); LOG_D("Setting notAfter to %" PRId64, cert_params.expire_date_time / 1000); - time_t notAfterTime = static_cast<time_t>(cert_params.expire_date_time / 1000); + int64_t notAfterTime = cert_params.expire_date_time / 1000; - if (!notAfter.get() || !ASN1_TIME_set(notAfter.get(), notAfterTime) || + if (!notAfter.get() || !ASN1_TIME_set_posix(notAfter.get(), notAfterTime) || !X509_set_notAfter(certificate.get(), notAfter.get() /* Don't release; copied */)) { return TranslateLastOpenSslError(); } |