Merge pull request #25 from tekktrik/dev/add-dependencies

Add pyasn1 as dependency

Author: FoamyGuy

README.rst

@@ -23,6 +23,8 @@ This driver depends on:
 
 * `Adafruit CircuitPython <https://github.com/adafruit/circuitpython>`_
 * `Adafruit CircuitPython Logger Module <https://github.com/adafruit/Adafruit_CircuitPython_Logger>`_
+* `pyasn1 Library <https://github.com/etingof/pyasn1>`_ (some functionality)
+* CPython's ``rsa`` Library (some functionality)
 
 Please ensure all dependencies are available on the CircuitPython filesystem.
 This is easily achieved by downloading

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,8 +266,17 @@ def _save_pkcs1_der(self):
         :rtype: bytes
         """
         # pylint: disable=import-outside-toplevel
-        from pyasn1.codec.der import encoder
-        from rsa.asn1 import AsnPubKey
+        try:
+            from pyasn1.codec.der import encoder
+        except ImportError as err:
+            raise ImportError("This functionality requires the  library") from err
+        try:
+            from rsa.asn1 import AsnPubKey
+        except ImportError as err:
+            raise ImportError(
+                "This functionality requres the CPython rsa library, "
+                "not available in CircuitPython"
+            ) from err
 
         # Create the ASN object
         asn_key = AsnPubKey()
@@ -328,9 +340,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 +492,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 +539,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"""