acme: remove kluge for older cryptography support

This commit is contained in:
Will Greenberg 2024-03-25 15:46:52 -07:00
parent 6f3eb0d2bc
commit 41ea7d2167

View file

@ -22,9 +22,7 @@ import warnings
from cryptography import x509
from cryptography.hazmat.primitives.hashes import SHA256
from cryptography.hazmat.primitives.asymmetric.dsa import DSAPrivateKey
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey
from cryptography.hazmat.primitives.asymmetric.ed448 import Ed448PrivateKey
from cryptography.hazmat.primitives.asymmetric.ec import EllipticCurvePrivateKey
from cryptography.hazmat.primitives.asymmetric.types import CertificateIssuerPrivateKeyTypes
from cryptography.hazmat.primitives.asymmetric.rsa import RSAPrivateKey
from cryptography.hazmat.primitives.serialization import Encoding
from cryptography.hazmat.primitives.serialization import load_pem_private_key
@ -234,15 +232,6 @@ def probe_sni(name: bytes, host: bytes, port: int = 443, timeout: int = 300, #
return cert
CertificateIssuerPrivateKeyTypes = Union[
Ed25519PrivateKey,
Ed448PrivateKey,
RSAPrivateKey,
DSAPrivateKey,
EllipticCurvePrivateKey,
]
def make_csr(private_key_pem: bytes, domains: Optional[Union[Set[str], List[str]]] = None,
must_staple: bool = False,
ipaddrs: Optional[List[Union[ipaddress.IPv4Address, ipaddress.IPv6Address]]] = None