python-igwn-auth-utils/igwn-auth-utils-cryptography-utc-deprecation.patch

24 lines
867 B
Diff
Raw Normal View History

Index: igwn-auth-utils-1.1.0/igwn_auth_utils/x509.py
===================================================================
--- igwn-auth-utils-1.1.0.orig/igwn_auth_utils/x509.py
+++ igwn-auth-utils-1.1.0/igwn_auth_utils/x509.py
@@ -95,13 +95,12 @@ def is_valid_certificate(cert, timeleft=
def _timeleft(cert):
"""Returns the time remaining (in seconds) for a ``cert``
"""
- expiry = cert.not_valid_after
try:
- now = datetime.datetime.now(datetime.UTC)
- except AttributeError: # python < 3.11
- now = datetime.datetime.utcnow()
- else:
- expiry = expiry.astimezone(datetime.UTC)
+ expiry = cert.not_valid_after_utc
+ except AttributeError:
+ # cryptography < 42
+ expiry = cert.not_valid_after
+ now = datetime.datetime.now(datetime.timezone.utc)
return (expiry - now).total_seconds()