Skip to content

Commit bc18d57

Browse files
committed
Switch to datetime-aware properties
1 parent 553f4b5 commit bc18d57

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

sslyze/mozilla_tls_profile/mozilla_config_checker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ def _check_certificates(
323323
deployed_signature_algorithms.add(leaf_cert.signature_algorithm_oid._name) # type: ignore
324324

325325
# Validate the cert's lifespan
326-
leaf_cert_lifespan = leaf_cert.not_valid_after - leaf_cert.not_valid_before
326+
leaf_cert_lifespan = leaf_cert.not_valid_after_utc - leaf_cert.not_valid_before_utc
327327
if leaf_cert_lifespan.days > mozilla_config.maximum_certificate_lifespan:
328328
issues_with_certificates["maximum_certificate_lifespan"] = (
329329
f"Certificate life span is {leaf_cert_lifespan.days} days,"

sslyze/plugins/certificate_info/_symantec.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import binascii
2-
from datetime import datetime
2+
from datetime import datetime, timezone
33
from enum import Enum
44
from typing import List, Optional
55

@@ -116,7 +116,7 @@ def get_distrust_timeline(
116116
distrust_enum = None
117117
if has_blacklisted_cert and not has_whitelisted_cert:
118118
leaf_cert = verified_certificate_chain[0]
119-
if leaf_cert.not_valid_before < datetime(year=2016, month=6, day=1):
119+
if leaf_cert.not_valid_before_utc < datetime(year=2016, month=6, day=1, tzinfo=timezone.utc):
120120
distrust_enum = SymantecDistrustTimelineEnum.MARCH_2018
121121
else:
122122
distrust_enum = SymantecDistrustTimelineEnum.SEPTEMBER_2018

sslyze/plugins/certificate_info/json_output.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,8 +187,8 @@ def _handle_object(cls, data: Any) -> Any:
187187
fingerprint_sha1=b64encode(certificate.fingerprint(hashes.SHA1())).decode("ascii"),
188188
fingerprint_sha256=b64encode(certificate.fingerprint(hashes.SHA256())).decode("ascii"),
189189
serial_number=certificate.serial_number,
190-
not_valid_before=certificate.not_valid_before,
191-
not_valid_after=certificate.not_valid_after,
190+
not_valid_before=certificate.not_valid_before_utc,
191+
not_valid_after=certificate.not_valid_after_utc,
192192
subject_alternative_name=_SubjAltNameAsJson(
193193
dns_names=subj_alt_name_ext.dns_names,
194194
ip_addresses=subj_alt_name_ext.ip_addresses,

0 commit comments

Comments
 (0)