Skip to content

Use cryptography's non-deprecated CFB location when available #1034

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

Open
okke-formsma wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −1
Open

Use cryptography's non-deprecated CFB location when available #1034

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
10 changes: 9 additions & 1 deletion src/saml2/cryptography/symmetric.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@
from .errors import SymmetricCryptographyError


try:
# cryptography >= 47 moved CFB here; use it to avoid CryptographyDeprecationWarning.
from cryptography.hazmat.decrepit.ciphers.modes import CFB as _CFB
except ImportError:
# older cryptography versions don't have the "decrepit" module yet.
_CFB = _ciphers.modes.CFB


logger = logging.getLogger(__name__)


Expand Down Expand Up @@ -105,7 +113,7 @@ class AESCipher:

POSTFIX_MODE = {
"cbc": _ciphers.modes.CBC,
"cfb": _ciphers.modes.CFB,
"cfb": _CFB,
}

AES_BLOCK_SIZE = int(_ciphers.algorithms.AES.block_size / 8)
Expand Down