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

Moved hashing to native python3 hashlib

Browse Source
This commit is contained in:
Mark Qvist 2022-06-07 12:51:41 +02:00
parent 379e56b2ce
commit 715a84c6f2
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
RNS/Destination.py
View File

@ -26,7 +26,6 @@ import time
import RNS import RNS
from cryptography.fernet import Fernet from cryptography.fernet import Fernet
from cryptography.hazmat.primitives import hashes
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
class Callbacks: class Callbacks:
@ -97,10 +96,7 @@ class Destination:
name = Destination.full_name(app_name, *aspects) name = Destination.full_name(app_name, *aspects)
# Create a digest for the destination # Create a digest for the destination
digest = hashes.Hash(hashes.SHA256(), backend=default_backend()) return RNS.Identity.full_hash(name.encode("utf-8"))[:RNS.Reticulum.TRUNCATED_HASHLENGTH//8]
digest.update(name.encode("UTF-8"))
return digest.finalize()[:10]
@staticmethod @staticmethod
def app_and_aspects_from_name(full_name): def app_and_aspects_from_name(full_name):

7
RNS/Identity.py
View File

@ -27,9 +27,10 @@ import RNS
import time import time
import atexit import atexit
import base64 import base64
import hashlib
from .vendor import umsgpack as umsgpack from .vendor import umsgpack as umsgpack
from cryptography.hazmat.backends import default_backend from cryptography.hazmat.backends import default_backend
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
@ -158,10 +159,10 @@ class Identity:
:param data: Data to be hashed as *bytes*. :param data: Data to be hashed as *bytes*.
:returns: SHA-256 hash as *bytes* :returns: SHA-256 hash as *bytes*
""" """
digest = hashes.Hash(hashes.SHA256(), backend=default_backend()) digest = hashlib.sha256()
digest.update(data) digest.update(data)
return digest.finalize() return digest.digest()
@staticmethod @staticmethod
def truncated_hash(data): def truncated_hash(data):