From 9004e2a25b3399c393359943f35f58d06474dc88 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Thu, 2 Jul 2020 15:30:37 +0200 Subject: [PATCH] crypto: accept ASCII str in aes_base64_decrypt (#44741) --- src/authentic2/crypto.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/authentic2/crypto.py b/src/authentic2/crypto.py index 0efa03ba..d369bca6 100644 --- a/src/authentic2/crypto.py +++ b/src/authentic2/crypto.py @@ -66,6 +66,11 @@ def aes_base64_encrypt(key, data): def aes_base64_decrypt(key, payload, raise_on_error=True): '''Decrypt data encrypted with aes_base64_encrypt''' + if not isinstance(payload, bytes): + try: + payload = payload.encode('ascii') + except Exception: + raise DecryptionError('payload is not an ASCII string') try: iv, crypted = payload.split(b'$') except (ValueError, TypeError): -- 2.26.2