Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 18 additions & 3 deletions flask_saml2/signing.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
from typing import ClassVar, Sequence, Tuple, Union
from urllib.parse import urlencode

import OpenSSL.crypto
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.primitives.asymmetric import padding

from flask_saml2.types import X509, PKey, XmlNode

Expand Down Expand Up @@ -98,7 +99,14 @@ def __init__(self, key: Union[X509, PKey]):
self.key = key

def __call__(self, data: bytes):
data = OpenSSL.crypto.sign(self.key, data, "sha1")
# pyOpenSSL PKey -> cryptography key:
priv = self.key.to_cryptography_key() # returns RSAPrivateKey
signature = priv.sign(
data,
padding.PKCS1v15(),
hashes.SHA1(),
)
data = signature
return base64.b64encode(data).decode('ascii')


Expand All @@ -109,7 +117,14 @@ def __init__(self, key: Union[X509, PKey]):
self.key = key

def __call__(self, data: bytes):
data = OpenSSL.crypto.sign(self.key, data, "sha256")
# pyOpenSSL PKey -> cryptography key:
priv = self.key.to_cryptography_key() # returns RSAPrivateKey
signature = priv.sign(
data,
padding.PKCS1v15(),
hashes.SHA256(), # prefer SHA-256, not SHA-1
)
data = signature
return base64.b64encode(data).decode('ascii')


Expand Down
2 changes: 1 addition & 1 deletion flask_saml2/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ def make_version_string(version_info):
return version_str


version_info = (0, 3, 0)
version_info = (0, 3, 1)
version_str = make_version_string(version_info)
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
'Flask>=1.0.0',
'signxml>=2.4.0',
'lxml>=3.8.0',
'pyopenssl<18',
'pyopenssl>=23',
'defusedxml>=0.5.0',
'pytz>=0',
'iso8601~=0.1.12',
Expand Down