naeural-client 2.1.5__tar.gz → 2.2.1__tar.gz

{naeural_client-2.1.5 → naeural_client-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: naeural_client
-Version: 2.1.5
+Version: 2.2.1
 Summary: `naeural_client` is the Python SDK required for client app development for the Naeural Edge Protocol Edge Protocol framework
 Project-URL: Homepage, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client
 Project-URL: Bug Tracker, https://github.com/Naeural Edge ProtocolEdgeProtocol/naeural_client/issues

{naeural_client-2.1.5 → naeural_client-2.2.1}/naeural_client/_ver.py

@@ -1,4 +1,4 @@
-__VER__ = "2.1.5"
+__VER__ = "2.2.1"
 
 if __name__ == "__main__":
   with open("pyproject.toml", "rt") as fd:

{naeural_client-2.1.5 → naeural_client-2.2.1}/naeural_client/bc/ec.py

@@ -271,8 +271,8 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     self, 
     plaintext: str, 
     receiver_address: str, 
-    compressed: bool = False,
-    embed_compressed: bool = False,
+    compressed: bool = True,
+    embed_compressed: bool = True,
     info: str = BCct.DEFAULT_INFO, 
     debug: bool = False
   ):
@@ -289,7 +289,10 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
         The plaintext to encrypt.
         
     compressed : bool, optional
-        Whether to compress the plaintext before encryption. The default is False.
+        Whether to compress the plaintext before encryption. The default is True.
+        
+    embed_compressed : bool, optional
+        Whether to embed the compressed flag in the encrypted data. The default is True.
 
     Returns
     -------
@@ -319,13 +322,18 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     self, 
     encrypted_data_b64 : str, 
     sender_address : str, 
-    decompress: bool = False,
-    embed_compressed: bool = False,
+    decompress: bool = False, # decompress is only used if embed_compressed is False
+    embed_compressed: bool = True,
     info: str = BCct.DEFAULT_INFO, 
     debug: bool = False
   ):
     """
     Decrypts base64 encoded encrypted data using the receiver's private key.
+    
+    The structure of the encrypted data is:
+    - 12 bytes nonce
+    - 1 byte compressed flag 
+    - 13:... The ciphertext
 
     Parameters
     ----------        
@@ -335,6 +343,13 @@ class BaseBCEllipticCurveEngine(BaseBlockEngine):
     sender_address : str
         The sender's address.
         
+    decompress : bool, optional
+        Whether to decompress the plaintext after decryption. The default is False as the decompression flag is embedded in the encrypted data.
+        
+    embed_compressed : bool, optional
+        Whether the compressed flag is embedded in the encrypted data. The default is True.
+        
+        
     Returns
     -------
     str

{naeural_client-2.1.5 → naeural_client-2.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "naeural_client"
-version = "2.1.5"
+version = "2.2.1"
 authors = [
   { name="Stefan Saraev", email="saraevstefan@gmail.com" },
   { name="Andrei Ionut Damian", email="andrei.damian@me.com" },

{naeural_client-2.1.5 → naeural_client-2.2.1}/xperimental/enc_dec_test.py

@@ -44,9 +44,9 @@ if __name__ == '__main__' :
   l.P("Non compressed test", color='g')  
   str_data = json.dumps(data)
   l.P(f"Data size: {len(str_data)}")  
-  encdata = eng1.encrypt(plaintext=str_data, receiver_address=eng2.address)
+  encdata = eng1.encrypt(plaintext=str_data, receiver_address=eng2.address, compressed=False, embed_compressed=False)
   l.P(f"Encrypted data (size: {len(encdata)}): {encdata}")  
-  decdata = eng2.decrypt(encrypted_data_b64=encdata, sender_address=eng1.address)
+  decdata = eng2.decrypt(encrypted_data_b64=encdata, sender_address=eng1.address, decompress=False, embed_compressed=False) 
   l.P(f"Decrypted data:\n {json.dumps(json.loads(decdata), indent=2)}")
   
   l.P("Compressed test", color='g')  
@@ -63,4 +63,12 @@ if __name__ == '__main__' :
   encdata = eng1.encrypt(plaintext=str_data, receiver_address=eng2.address, compressed=True, embed_compressed=True)
   l.P(f"Encrypted data (size: {len(encdata)}): {encdata}")  
   decdata = eng2.decrypt(encrypted_data_b64=encdata, sender_address=eng1.address, embed_compressed=True) # decompress does not matter
-  l.P(f"Decrypted data:\n {json.dumps(json.loads(decdata), indent=2)}")    
+  l.P(f"Decrypted data:\n {json.dumps(json.loads(decdata), indent=2)}")    
+  
+  l.P("Default test", color='g')  
+  str_data = json.dumps(data)
+  l.P(f"Data size: {len(str_data)}")  
+  encdata = eng1.encrypt(plaintext=str_data, receiver_address=eng2.address)
+  l.P(f"Encrypted data (size: {len(encdata)}): {encdata}")  
+  decdata = eng2.decrypt(encrypted_data_b64=encdata, sender_address=eng1.address)
+  l.P(f"Decrypted data:\n {json.dumps(json.loads(decdata), indent=2)}")