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

Moved Identity Fernet to internal implementation

Browse Source
This commit is contained in:
Mark Qvist 2022-06-08 12:29:51 +02:00
parent d1a461a2b3
commit 5d3a0efc89
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
RNS/Identity.py
View File

@ -34,7 +34,8 @@ from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import serialization from cryptography.hazmat.primitives import serialization
from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey, Ed25519PublicKey from cryptography.hazmat.primitives.asymmetric.ed25519 import Ed25519PrivateKey, Ed25519PublicKey
from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey from cryptography.hazmat.primitives.asymmetric.x25519 import X25519PrivateKey, X25519PublicKey
from cryptography.fernet import Fernet
from RNS.Cryptography import Fernet
class Identity: class Identity:
@ -431,8 +432,8 @@ class Identity:
context=self.get_context(), context=self.get_context(),
) )
fernet = Fernet(base64.urlsafe_b64encode(derived_key)) fernet = Fernet(derived_key)
ciphertext = base64.urlsafe_b64decode(fernet.encrypt(plaintext)) ciphertext = fernet.encrypt(plaintext)
token = ephemeral_pub_bytes+ciphertext token = ephemeral_pub_bytes+ciphertext
return token return token
@ -464,9 +465,9 @@ class Identity:
context=self.get_context(), context=self.get_context(),
) )
fernet = Fernet(base64.urlsafe_b64encode(derived_key)) fernet = Fernet(derived_key)
ciphertext = ciphertext_token[Identity.KEYSIZE//8//2:] ciphertext = ciphertext_token[Identity.KEYSIZE//8//2:]
plaintext = fernet.decrypt(base64.urlsafe_b64encode(ciphertext)) plaintext = fernet.decrypt(ciphertext)
except Exception as e: except Exception as e:
RNS.log("Decryption by "+RNS.prettyhexrep(self.hash)+" failed: "+str(e), RNS.LOG_DEBUG) RNS.log("Decryption by "+RNS.prettyhexrep(self.hash)+" failed: "+str(e), RNS.LOG_DEBUG)