Merge branch 'feature/asn1crypto-upgrade' into release/0.8.2

MatthiasValvekens · Mar 8, 2022 · b80242e · b80242e
2 parents 4cf2770 + 5149687
commit b80242e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 233 deletions.
diff --git a/certomancer/_asn1crypto_patches.py b/certomancer/_asn1crypto_patches.py
diff --git a/certomancer/crypto_utils.py b/certomancer/crypto_utils.py
@@ -270,13 +270,8 @@ def _oscrypto_hacky_load_pss_exclusive_key(private: keys.PrivateKeyInfo):
 
 
 def _select_default_crypto_backend() -> CryptoBackend:
-    from ._asn1crypto_patches import register_attr_cert_patches
-    register_attr_cert_patches()
     # pyca/cryptography required for EdDSA certs
     if pyca_cryptography_present():
-        # Patch EdDSA support into asn1crypto
-        from ._asn1crypto_patches import register_eddsa_oids
-        register_eddsa_oids()
         return PycaCryptographyBackend()
     else:
         return OscryptoBackend()

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,4 @@
-asn1crypto>=1.4.0
+asn1crypto>=1.5.0
 click>=7.1.2
 pyyaml>=5.4.1
 oscrypto>=1.2.1

diff --git a/setup.py b/setup.py
@@ -54,7 +54,7 @@ def get_version():
         ]
     },
     install_requires=[
-        'asn1crypto>=1.4.0',
+        'asn1crypto>=1.5.0',
         'click>=7.1.2',
         'oscrypto>=1.2.1',
         'pyyaml>=5.4.1',