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 Link Fernet to internal implementation

Browse Source
This commit is contained in:
Mark Qvist 2022-06-08 12:34:31 +02:00
parent 5d3a0efc89
commit 4bd5f05e0e
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RNS/Identity.py
View File

@ -20,13 +20,11 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE. # SOFTWARE.
import base64
import math import math
import os import os
import RNS import RNS
import time import time
import atexit import atexit
import base64
import hashlib import hashlib
from .vendor import umsgpack as umsgpack from .vendor import umsgpack as umsgpack

13
RNS/Link.py
View File

@ -25,11 +25,12 @@ from cryptography.hazmat.primitives import hashes
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
from time import sleep from time import sleep
from .vendor import umsgpack as umsgpack from .vendor import umsgpack as umsgpack
import threading import threading
import base64
import math import math
import time import time
import RNS import RNS
@ -787,7 +788,7 @@ class Link:
try: try:
if not self.fernet: if not self.fernet:
try: try:
self.fernet = Fernet(base64.urlsafe_b64encode(self.derived_key)) self.fernet = Fernet(self.derived_key)
except Exception as e: except Exception as e:
RNS.log("Could not "+str(self)+" instantiate Fernet while performin encryption on link. The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Could not "+str(self)+" instantiate Fernet while performin encryption on link. The contained exception was: "+str(e), RNS.LOG_ERROR)
raise e raise e
@ -800,7 +801,7 @@ class Link:
# stamps until the year 8921556 AD, we'll also strip 2 # stamps until the year 8921556 AD, we'll also strip 2
# bytes from the timestamp field and reinsert those as # bytes from the timestamp field and reinsert those as
# 0x00 when received. # 0x00 when received.
ciphertext = base64.urlsafe_b64decode(self.fernet.encrypt(plaintext))[3:] ciphertext = self.fernet.encrypt(plaintext)[3:]
return ciphertext return ciphertext
except Exception as e: except Exception as e:
@ -811,9 +812,9 @@ class Link:
def decrypt(self, ciphertext): def decrypt(self, ciphertext):
try: try:
if not self.fernet: if not self.fernet:
self.fernet = Fernet(base64.urlsafe_b64encode(self.derived_key)) self.fernet = Fernet(self.derived_key)
plaintext = self.fernet.decrypt(base64.urlsafe_b64encode(bytes([RNS.Identity.FERNET_VERSION, 0x00, 0x00])+ciphertext)) plaintext = self.fernet.decrypt(bytes([RNS.Identity.FERNET_VERSION, 0x00, 0x00]) + ciphertext)
return plaintext return plaintext
except Exception as e: except Exception as e:
RNS.log("Decryption failed on link "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR) RNS.log("Decryption failed on link "+str(self)+". The contained exception was: "+str(e), RNS.LOG_ERROR)