Skip to content

Remove explicit pyoidc dependency to avoid collision with pyop. #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 22, 2016
Merged

Remove explicit pyoidc dependency to avoid collision with pyop. #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions src/satosa/state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/satosa/backends/test_openid_connect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down