[implem-python] Suppression de paramètres redondants

tweak_bits est  constant pour un mode  donné ; rounds se  déduit de la
taille de clé.

1 files changed, 5 insertions, 24 deletions

diff --git a/python/lilliput.py b/python/lilliput.py
index 21feb60..f6679a8 100644
--- a/python/lilliput.py
+++ b/python/lilliput.py
@@ -1,24 +1,9 @@
 import lilliput_ae_1
 import lilliput_ae_2
 
-N_BYTES = 15
-
-def _getParameters(mode=1, key_length=128) :
-    rounds = {
-        128: 32,
-        192: 36,
-        256: 42
-    }
-
-    tweak_lengths = {
-        1: 192,
-        2: 128
-    }
-
-    return tweak_lengths[mode], rounds[key_length]
 
+N_BYTES = 15
 
-############################################
 
 def _checkInputs(key, nonce):
     valid_key_lengths = (128, 192, 256)
@@ -33,29 +18,25 @@ def _checkInputs(key, nonce):
 def mainEnc(plaintext, adata, key, nonce, mode):
     _checkInputs(key, nonce)
 
-    tweak_bits, rounds = _getParameters(mode, len(key)*8)
-
     A = adata
     M = plaintext
     N = nonce
 
     if(mode == 1) :
-        return lilliput_ae_1.OCB3Enc(A, M, N, key, tweak_bits, rounds)
+        return lilliput_ae_1.OCB3Enc(A, M, N, key)
     if(mode == 2) :
-        return lilliput_ae_2.SCT2Enc(A, M, N, key, tweak_bits, rounds)
+        return lilliput_ae_2.SCT2Enc(A, M, N, key)
 
 
 def mainDec(ciphertext, tag, adata, key, nonce, mode):
     _checkInputs(key, nonce)
 
-    tweak_bits, rounds = _getParameters(mode, len(key)*8)
-
     A = adata
     C = ciphertext
     N = nonce
     tag = list(tag)
 
     if(mode == 1) :
-        return lilliput_ae_1.OCB3Dec(A, C, N, tag, key, tweak_bits, rounds)
+        return lilliput_ae_1.OCB3Dec(A, C, N, tag, key)
     if(mode == 2) :
-        return lilliput_ae_2.SCT2Dec(A, C, N, tag, key, tweak_bits, rounds)
+        return lilliput_ae_2.SCT2Dec(A, C, N, tag, key)