Add try/except guards for pyasn1 imports

Author: tekktrik

adafruit_rsa/asn1.py

@@ -9,7 +9,10 @@
 """
 
 # pylint: disable=no-name-in-module, too-few-public-methods
-from pyasn1.type import univ, namedtype, tag
+try:
+    from pyasn1.type import univ, namedtype, tag
+except ImportError as err:
+    raise ImportError("Usage of asn1.py requires pyasn1 library") from err
 
 __version__ = "0.0.0-auto.0"
 __repo__ = "https://github.com/adafruit/Adafruit_CircuitPython_RSA.git"

adafruit_rsa/key.py

@@ -250,8 +250,11 @@ def _load_pkcs1_der(cls, keyfile):
 
         """
         # pylint: disable=import-outside-toplevel
-        from adafruit_rsa.tools.pyasn1.codec.der import decoder
-        from adafruit_rsa.asn1 import AsnPubKey
+        try:
+            from adafruit_rsa.tools.pyasn1.codec.der import decoder
+            from adafruit_rsa.asn1 import AsnPubKey
+        except ImportError as err:
+            raise ImportError("This functionality requires the pyasn1 library") from err
 
         (priv, _) = decoder.decode(keyfile, asn1Spec=AsnPubKey())
         return cls(n=int(priv["modulus"]), e=int(priv["publicExponent"]))
@@ -263,7 +266,10 @@ def _save_pkcs1_der(self):
         :rtype: bytes
         """
         # pylint: disable=import-outside-toplevel
-        from pyasn1.codec.der import encoder
+        try:
+            from pyasn1.codec.der import encoder
+        except ImportError as err:
+            raise ImportError("This functionality requires the  library") from err
         from rsa.asn1 import AsnPubKey
 
         # Create the ASN object
@@ -328,9 +334,12 @@ def load_pkcs1_openssl_der(cls, keyfile):
 
         """
         # pylint: disable=import-outside-toplevel
-        from adafruit_rsa.asn1 import OpenSSLPubKey
-        from pyasn1.codec.der import decoder
-        from pyasn1.type import univ
+        try:
+            from adafruit_rsa.asn1 import OpenSSLPubKey
+            from pyasn1.codec.der import decoder
+            from pyasn1.type import univ
+        except ImportError as err:
+            raise ImportError("This functionality requires the pyasn1 library") from err
 
         (keyinfo, _) = decoder.decode(keyfile, asn1Spec=OpenSSLPubKey())
 
@@ -477,9 +486,12 @@ def _load_pkcs1_der(cls, keyfile):
 
         """
 
-        from adafruit_rsa.tools.pyasn1.codec.der import (  # pylint: disable=import-outside-toplevel
-            decoder,
-        )
+        try:
+            from adafruit_rsa.tools.pyasn1.codec.der import (  # pylint: disable=import-outside-toplevel
+                decoder,
+            )
+        except ImportError as err:
+            raise ImportError("This functionality requires the pyasn1 library") from err
 
         (priv, _) = decoder.decode(keyfile)
 
@@ -521,8 +533,11 @@ def _save_pkcs1_der(self):
         :rtype: bytes
         """
         # pylint: disable=import-outside-toplevel
-        from pyasn1.type import univ, namedtype
-        from pyasn1.codec.der import encoder
+        try:
+            from pyasn1.type import univ, namedtype
+            from pyasn1.codec.der import encoder
+        except ImportError as err:
+            raise ImportError("This functionality requires the pyasn1 library") from err
 
         class AsnPrivKey(univ.Sequence):
             """Creates PKCS#1 DER Formatted AsnPrivKey"""