Merge pull request #57 from its-dirg/deps-fix

Remove explicit pyoidc dependency to avoid collision with pyop.

Author: RebeckaG

setup.py

@@ -15,10 +15,9 @@
     packages=find_packages('src/'),
     package_dir={'': 'src'},
     install_requires=[
-        "oic>=0.8.4.0",
         "pyop==2.0.1",
-        "pyjwkest==1.1.5",
         "pysaml2==4.2.0",
+        "pycryptodomex",
         "requests",
         "PyYAML",
         "gunicorn",

src/satosa/state.py

@@ -10,8 +10,8 @@
 from http.cookies import SimpleCookie
 from lzma import LZMADecompressor, LZMACompressor
 
-from Crypto import Random
-from Crypto.Cipher import AES
+from Cryptodome import Random
+from Cryptodome.Cipher import AES
 
 from .exception import SATOSAStateError
 from .logging_util import satosa_logging

tests/satosa/backends/test_openid_connect.py

@@ -7,7 +7,7 @@
 import oic
 import pytest
 import responses
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 from jwkest.jwk import RSAKey
 from oic.oic.message import RegistrationRequest, IdToken
 from oic.utils.authn.client import CLIENT_AUTHN_METHOD

tests/util.py

@@ -6,7 +6,7 @@
 from datetime import datetime
 from urllib.parse import parse_qsl, urlparse
 
-from Crypto.PublicKey import RSA
+from Cryptodome.PublicKey import RSA
 from bs4 import BeautifulSoup
 from saml2 import server, BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
 from saml2.authn_context import AuthnBroker, authn_context_class_ref, PASSWORD