From: Bob Halley <halley@dnspython.org>
Date: Mon, 17 Jul 2023 12:58:50 +0000 (-0700)
Subject: Make importing dns.dnssecalgs work if cryptography is not installed
X-Git-Tag: v2.4.1~12
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=9e9132ac9aa35e5ebede890a4e1a1ee10a650840;p=thirdparty%2Fdnspython.git

Make importing dns.dnssecalgs work if cryptography is not installed
[#957].

(cherry picked from commit e0991157b8773218c33401c90b2715e532c804e7)
---

diff --git a/dns/dnssecalgs/__init__.py b/dns/dnssecalgs/__init__.py
index 0c48c89e..d1ffd519 100644
--- a/dns/dnssecalgs/__init__.py
+++ b/dns/dnssecalgs/__init__.py
@@ -1,36 +1,47 @@
 from typing import Dict, Optional, Tuple, Type, Union
 
 import dns.name
-from dns.dnssecalgs.base import GenericPrivateKey
-from dns.dnssecalgs.dsa import PrivateDSA, PrivateDSANSEC3SHA1
-from dns.dnssecalgs.ecdsa import PrivateECDSAP256SHA256, PrivateECDSAP384SHA384
-from dns.dnssecalgs.eddsa import PrivateED448, PrivateED25519
-from dns.dnssecalgs.rsa import (
-    PrivateRSAMD5,
-    PrivateRSASHA1,
-    PrivateRSASHA1NSEC3SHA1,
-    PrivateRSASHA256,
-    PrivateRSASHA512,
-)
+
+try:
+    from dns.dnssecalgs.base import GenericPrivateKey
+    from dns.dnssecalgs.dsa import PrivateDSA, PrivateDSANSEC3SHA1
+    from dns.dnssecalgs.ecdsa import PrivateECDSAP256SHA256, PrivateECDSAP384SHA384
+    from dns.dnssecalgs.eddsa import PrivateED448, PrivateED25519
+    from dns.dnssecalgs.rsa import (
+        PrivateRSAMD5,
+        PrivateRSASHA1,
+        PrivateRSASHA1NSEC3SHA1,
+        PrivateRSASHA256,
+        PrivateRSASHA512,
+    )
+
+    _have_cryptography = True
+except ImportError:
+    _have_cryptography = False
+
 from dns.dnssectypes import Algorithm
 from dns.exception import UnsupportedAlgorithm
 from dns.rdtypes.ANY.DNSKEY import DNSKEY
 
 AlgorithmPrefix = Optional[Union[bytes, dns.name.Name]]
 
-algorithms: Dict[Tuple[Algorithm, AlgorithmPrefix], Type[GenericPrivateKey]] = {
-    (Algorithm.RSAMD5, None): PrivateRSAMD5,
-    (Algorithm.DSA, None): PrivateDSA,
-    (Algorithm.RSASHA1, None): PrivateRSASHA1,
-    (Algorithm.DSANSEC3SHA1, None): PrivateDSANSEC3SHA1,
-    (Algorithm.RSASHA1NSEC3SHA1, None): PrivateRSASHA1NSEC3SHA1,
-    (Algorithm.RSASHA256, None): PrivateRSASHA256,
-    (Algorithm.RSASHA512, None): PrivateRSASHA512,
-    (Algorithm.ECDSAP256SHA256, None): PrivateECDSAP256SHA256,
-    (Algorithm.ECDSAP384SHA384, None): PrivateECDSAP384SHA384,
-    (Algorithm.ED25519, None): PrivateED25519,
-    (Algorithm.ED448, None): PrivateED448,
-}
+algorithms: Dict[Tuple[Algorithm, AlgorithmPrefix], Type[GenericPrivateKey]] = {}
+if _have_cryptography:
+    algorithms.update(
+        {
+            (Algorithm.RSAMD5, None): PrivateRSAMD5,
+            (Algorithm.DSA, None): PrivateDSA,
+            (Algorithm.RSASHA1, None): PrivateRSASHA1,
+            (Algorithm.DSANSEC3SHA1, None): PrivateDSANSEC3SHA1,
+            (Algorithm.RSASHA1NSEC3SHA1, None): PrivateRSASHA1NSEC3SHA1,
+            (Algorithm.RSASHA256, None): PrivateRSASHA256,
+            (Algorithm.RSASHA512, None): PrivateRSASHA512,
+            (Algorithm.ECDSAP256SHA256, None): PrivateECDSAP256SHA256,
+            (Algorithm.ECDSAP384SHA384, None): PrivateECDSAP384SHA384,
+            (Algorithm.ED25519, None): PrivateED25519,
+            (Algorithm.ED448, None): PrivateED448,
+        }
+    )
 
 
 def get_algorithm_cls(