William/Reticulum
1
0
Fork 0
mirror of https://github.com/markqvist/Reticulum.git synced 2024-11-22 21:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated exceptions

Browse Source
This commit is contained in:
Mark Qvist 2023-10-24 01:39:25 +02:00
parent 0dc78241ac
commit 9f425c2e8d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
RNS/Cryptography/Fernet.py
View File

@ -45,10 +45,10 @@ class Fernet():
def __init__(self, key = None): def __init__(self, key = None):
if key == None: if key == None:
raise ValueError("Fernet key cannot be None") raise ValueError("Token key cannot be None")
if len(key) != 32: if len(key) != 32:
raise ValueError("Fernet key must be 32 bytes, not "+str(len(key))) raise ValueError("Token key must be 32 bytes, not "+str(len(key)))
self._signing_key = key[:16] self._signing_key = key[:16]
self._encryption_key = key[16:] self._encryption_key = key[16:]
@ -72,7 +72,7 @@ class Fernet():
current_time = int(time.time()) current_time = int(time.time())
if not isinstance(data, bytes): if not isinstance(data, bytes):
raise TypeError("Fernet token plaintext input must be bytes") raise TypeError("Token plaintext input must be bytes")
ciphertext = AES_128_CBC.encrypt( ciphertext = AES_128_CBC.encrypt(
plaintext = PKCS7.pad(data), plaintext = PKCS7.pad(data),
@ -87,10 +87,10 @@ class Fernet():
def decrypt(self, token = None): def decrypt(self, token = None):
if not isinstance(token, bytes): if not isinstance(token, bytes):
raise TypeError("Fernet token must be bytes") raise TypeError("Token must be bytes")
if not self.verify_hmac(token): if not self.verify_hmac(token):
raise ValueError("Fernet token HMAC was invalid") raise ValueError("Token HMAC was invalid")
iv = token[:16] iv = token[:16]
ciphertext = token[16:-32] ciphertext = token[16:-32]
@ -107,4 +107,4 @@ class Fernet():
return plaintext return plaintext
except Exception as e: except Exception as e:
raise ValueError("Could not decrypt Fernet token") raise ValueError("Could not decrypt token")