From 02eb0c9f257435595889d15577e4641b2242d0a1 Mon Sep 17 00:00:00 2001
From: Kévin Le Gouguec <kevin.legouguec@airbus.com>
Date: Thu, 14 Mar 2019 12:38:36 +0100
Subject: [implem-python] Suppression de paramètres redondants
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Création d'un  nouveau module  "helpers" qui contiendra  les fonctions
utilisées par les deux modes.
---
 python/lilliput_ae_1.py | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'python/lilliput_ae_1.py')

diff --git a/python/lilliput_ae_1.py b/python/lilliput_ae_1.py
index cd7fc82..3629fec 100644
--- a/python/lilliput_ae_1.py
+++ b/python/lilliput_ae_1.py
@@ -3,6 +3,8 @@
 """
 
 import lilliput_tbc as ltbc
+from helpers import ArrayToBlockbytesMatrix, BlockbytesMatrixToBytes
+
 
 BLOCK_BITS = 128
 KEY_BITS = 128
@@ -219,14 +221,17 @@ def TreatMessageDec(C, N, key) :
 
 
 ################################################################################
-def OCB3Enc(A, M, N, associated_data_length_bit, message_length_bit, key, key_bits, tweak_bits, rounds) :
-    InitParameters(key_bits, tweak_bits, rounds)
+def OCB3Enc(A, M, N, key, tweak_bits, rounds) :
+    InitParameters(len(key)*8, tweak_bits, rounds)
 
     global A_BITS
     global M_BITS
 
-    A_BITS = associated_data_length_bit
-    M_BITS = message_length_bit
+    A_BITS = len(A)*8
+    M_BITS = len(M)*8
+
+    A = ArrayToBlockbytesMatrix(A)
+    M = ArrayToBlockbytesMatrix(M)
 
     ltbc.KEY_BITS = KEY_BITS
     ltbc.ROUNDS = ROUNDS
@@ -247,17 +252,20 @@ def OCB3Enc(A, M, N, associated_data_length_bit, message_length_bit, key, key_bi
     (Final, C) = TreatMessageEnc(M, N, key)
     tag = XorState(Auth, Final)
 
-    return (C, tag)
+    return BlockbytesMatrixToBytes(C), bytes(tag)
 
 
-def OCB3Dec(A, C, N, tag, associated_data_length_bit, message_length_bit, key, key_bits, tweak_bits, rounds) :
-    InitParameters(key_bits, tweak_bits, rounds)
+def OCB3Dec(A, C, N, tag, key, tweak_bits, rounds) :
+    InitParameters(len(key)*8, tweak_bits, rounds)
 
     global A_BITS
     global M_BITS
 
-    A_BITS = associated_data_length_bit
-    M_BITS = message_length_bit
+    A_BITS = len(A)*8
+    M_BITS = len(C)*8
+
+    A = ArrayToBlockbytesMatrix(A)
+    C = ArrayToBlockbytesMatrix(C)
 
     ltbc.KEY_BITS = KEY_BITS
     ltbc.ROUNDS = ROUNDS
@@ -278,4 +286,4 @@ def OCB3Dec(A, C, N, tag, associated_data_length_bit, message_length_bit, key, k
     tag2 = XorState(Auth, Final)
 
     if(tag == tag2) :
-        return M
+        return BlockbytesMatrixToBytes(M)
-- 
cgit v1.2.3