starred/certbot-certbot-1
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-02 03:22:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Migrate get_serial_from_cert and valid_privkey to cryptography (#10116)

Browse Source
This commit is contained in:
Alex Gaynor
2025-01-06 13:34:57 -08:00
committed by GitHub
parent 6ea5da51e0
commit 8f7c3756b3
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
certbot/certbot/crypto_util.py
+8 -6
View File
@@ -268,11 +268,14 @@ def valid_privkey(privkey: Union[str, bytes]) -> bool:
:rtype: bool :rtype: bool
""" """
if isinstance(privkey, str):
privkey = privkey.encode()
try: try:
return crypto.load_privatekey( serialization.load_pem_private_key(privkey, password=None)
crypto.FILETYPE_PEM, privkey).check() except ValueError:
except (TypeError, crypto.Error):
return False return False
else:
return True
def verify_renewable_cert(renewable_cert: interfaces.RenewableCert) -> None: def verify_renewable_cert(renewable_cert: interfaces.RenewableCert) -> None:
@@ -604,10 +607,9 @@ def get_serial_from_cert(cert_path: str) -> int:
:returns: serial number of the certificate :returns: serial number of the certificate
:rtype: int :rtype: int
""" """
# pylint: disable=redefined-outer-name
with open(cert_path, "rb") as f: with open(cert_path, "rb") as f:
x509 = crypto.load_certificate(crypto.FILETYPE_PEM, f.read()) cert = x509.load_pem_x509_certificate(f.read())
return x509.get_serial_number() return cert.serial_number
def find_chain_with_issuer(fullchains: List[str], issuer_cn: str, def find_chain_with_issuer(fullchains: List[str], issuer_cn: str,