From 5d3a0efc89fa5a6fc75836bfd6bba84d25062408 Mon Sep 17 00:00:00 2001 From: Mark Qvist Date: Wed, 8 Jun 2022 12:29:51 +0200 Subject: [PATCH] Moved Identity Fernet to internal implementation --- RNS/Identity.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/RNS/Identity.py b/RNS/Identity.py index 9ce9bec..a1cdbec 100644 --- a/RNS/Identity.py +++ b/RNS/Identity.py @@ -34,7 +34,8 @@ from cryptography.hazmat.backends import default_backend from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey, Ed25519PublicKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey -from cryptography.fernet import Fernet + +from RNS.Cryptography import Fernet class Identity: @@ -431,8 +432,8 @@ class Identity: context=self.get_context(), ) - fernet = Fernet(base64.urlsafe_b64encode(derived_key)) - ciphertext = base64.urlsafe_b64decode(fernet.encrypt(plaintext)) + fernet = Fernet(derived_key) + ciphertext = fernet.encrypt(plaintext) token = ephemeral_pub_bytes+ciphertext return token @@ -464,9 +465,9 @@ class Identity: context=self.get_context(), ) - fernet = Fernet(base64.urlsafe_b64encode(derived_key)) + fernet = Fernet(derived_key) ciphertext = ciphertext_token[Identity.KEYSIZE//8//2:] - plaintext = fernet.decrypt(base64.urlsafe_b64encode(ciphertext)) + plaintext = fernet.decrypt(ciphertext) except Exception as e: RNS.log("Decryption by "+RNS.prettyhexrep(self.hash)+" failed: "+str(e), RNS.LOG_DEBUG)