[implem-python] Renommage du module TBC

Quand le  tout sera packagé  sous le namespace "lilliput",  le préfixe
alourdira plus qu'autre chose.

4 files changed, 20 insertions, 20 deletions

diff --git a/python/helpers.py b/python/helpers.py
index be4b406..321b096 100644
--- a/python/helpers.py
+++ b/python/helpers.py
@@ -1,5 +1,5 @@
 from constants import BLOCK_BITS, BLOCK_BYTES
-from lilliput_tbc import LilliputTBCEnc
+import tbc
 
 
 def ArrayToBlockbytesMatrix(array):
@@ -65,7 +65,7 @@ def BuildAuth(t, A, key):
 
     for i in range(0, l_a):
         tweak = _tweakAssociatedData(t, i, padded=False)
-        enc = LilliputTBCEnc(tweak, key, A[i])
+        enc = tbc.encrypt(tweak, key, A[i])
         Auth = XorState(Auth, enc)
 
     if not need_padding:
@@ -73,7 +73,7 @@ def BuildAuth(t, A, key):
 
     tweak = _tweakAssociatedData(t, l_a, padded=True)
     ad_padded = Padding10LSB(A[l_a])
-    enc = LilliputTBCEnc(tweak, key, ad_padded)
+    enc = tbc.encrypt(tweak, key, ad_padded)
     Auth = XorState(Auth, enc)
 
     return Auth
diff --git a/python/lilliput_ae_1.py b/python/lilliput_ae_1.py
index 5cc263b..8064871 100644
--- a/python/lilliput_ae_1.py
+++ b/python/lilliput_ae_1.py
@@ -4,7 +4,6 @@
 
 from enum import Enum
 
-import lilliput_tbc as ltbc
 from constants import BLOCK_BYTES, NONCE_BYTES
 from helpers import (
     ArrayToBlockbytesMatrix,
@@ -14,6 +13,7 @@ from helpers import (
     TagValidationError,
     XorState
 )
+import tbc
 
 
 TWEAK_BITS = 192
@@ -78,22 +78,22 @@ def TreatMessageEnc(M, N, key):
     for j in range(0, l):
         checksum = XorState(checksum, M[j])
         tweak = TweakMessage(N, j, _MessageTweak.BLOCK)
-        C.append(ltbc.LilliputTBCEnc(tweak, key, M[j]))
+        C.append(tbc.encrypt(tweak, key, M[j]))
 
     if padding_bytes == 0:
         tweak = TweakMessage(N, l, _MessageTweak.NO_PADDING)
-        Final = ltbc.LilliputTBCEnc(tweak, key, checksum)
+        Final = tbc.encrypt(tweak, key, checksum)
 
     else:
         m_padded = Padding10LSB(M[l])
         checksum = XorState(checksum, m_padded)
         tweak = TweakMessage(N, l, _MessageTweak.PAD)
-        pad = ltbc.LilliputTBCEnc(tweak, key, [0 for byte in range(0, BLOCK_BYTES)])
+        pad = tbc.encrypt(tweak, key, [0 for byte in range(0, BLOCK_BYTES)])
 
         lower_part = LowPart(pad, padding_bytes*8)
         C.append(XorState(M[l], lower_part))
         tweak_final = TweakMessage(N, l+1, _MessageTweak.FINAL)
-        Final = ltbc.LilliputTBCEnc(tweak_final, key, checksum)
+        Final = tbc.encrypt(tweak_final, key, checksum)
 
     return (Final, C)
 
@@ -109,23 +109,23 @@ def TreatMessageDec(C, N, key):
 
     for j in range(0, l):
         tweak = TweakMessage(N, j, _MessageTweak.BLOCK)
-        M.append(ltbc.LilliputTBCDec(tweak, key, C[j]))
+        M.append(tbc.decrypt(tweak, key, C[j]))
         checksum = XorState(checksum, M[j])
 
     if padding_bytes == 0:
         tweak = TweakMessage(N, l, _MessageTweak.NO_PADDING)
-        Final = ltbc.LilliputTBCEnc(tweak, key, checksum)
+        Final = tbc.encrypt(tweak, key, checksum)
 
     else:
         tweak = TweakMessage(N, l, _MessageTweak.PAD)
-        pad = ltbc.LilliputTBCEnc(tweak, key, [0 for byte in range(0, BLOCK_BYTES)])
+        pad = tbc.encrypt(tweak, key, [0 for byte in range(0, BLOCK_BYTES)])
         lower_part = LowPart(pad, padding_bytes*8)
         M.append(XorState(C[l], lower_part))
 
         m_padded = Padding10LSB(M[l])
         checksum = XorState(checksum, m_padded)
         tweak_final = TweakMessage(N, l+1, _MessageTweak.FINAL)
-        Final = ltbc.LilliputTBCEnc(tweak_final, key, checksum)
+        Final = tbc.encrypt(tweak_final, key, checksum)
 
     return (Final, M)
 
diff --git a/python/lilliput_ae_2.py b/python/lilliput_ae_2.py
index 2e7843b..3c0aa2a 100644
--- a/python/lilliput_ae_2.py
+++ b/python/lilliput_ae_2.py
@@ -2,7 +2,6 @@
     SCT 2 for lilliput ae 2
 """
 
-import lilliput_tbc as ltbc
 from constants import BLOCK_BYTES
 from helpers import (
     ArrayToBlockbytesMatrix,
@@ -12,6 +11,7 @@ from helpers import (
     TagValidationError,
     XorState
 )
+import tbc
 
 
 TWEAK_BITS = 128
@@ -62,17 +62,17 @@ def MesssageAuthTag(M, N, Auth, key):
 
     for j in range(0, l):
         tweak = TweakTag(j, False)
-        encryption = ltbc.LilliputTBCEnc(tweak, key, M[j])
+        encryption = tbc.encrypt(tweak, key, M[j])
         tag = XorState(tag, encryption)
 
     if need_padding:
         tweak = TweakTag(l, True)
         m_padded = Padding10LSB(M[l])
-        encryption = ltbc.LilliputTBCEnc(tweak, key, m_padded)
+        encryption = tbc.encrypt(tweak, key, m_padded)
         tag = XorState(tag, encryption)
 
     tweak = TweakTagEnd(N)
-    encryption = ltbc.LilliputTBCEnc(tweak, key, tag)
+    encryption = tbc.encrypt(tweak, key, tag)
     tag = encryption
 
     return tag
@@ -88,13 +88,13 @@ def MessageEncryption(M, N, tag, key):
     for j in range(0, l):
         tweak = AddTagJ(tag, j)
         padded_nonce = list(N) + [0x00]
-        encryption = ltbc.LilliputTBCEnc(tweak, key, padded_nonce)
+        encryption = tbc.encrypt(tweak, key, padded_nonce)
         C.append(XorState(M[j], encryption))
 
     if need_padding:
         tweak = AddTagJ(tag, l)
         padded_nonce = list(N) + [0x00]
-        encryption = ltbc.LilliputTBCEnc(tweak, key, padded_nonce)
+        encryption = tbc.encrypt(tweak, key, padded_nonce)
         C.append(XorState(M[l], encryption))
 
     return C
diff --git a/python/lilliput_tbc.py b/python/tbc.py
index 9dc7df2..ca51649 100644
--- a/python/lilliput_tbc.py
+++ b/python/tbc.py
@@ -136,7 +136,7 @@ def _rounds(key_bytes):
 ################################################################################
 # Lilliput TBC
 
-def LilliputTBCEnc(tweak, key, message):
+def encrypt(tweak, key, message):
     r = _rounds(len(key))
 
     tweakey = BuildTweakey(tweak, key)
@@ -157,7 +157,7 @@ def LilliputTBCEnc(tweak, key, message):
     return state_output
 
 
-def LilliputTBCDec(tweak, key, cipher):
+def decrypt(tweak, key, cipher):
     r = _rounds(len(key))
 
     tweakey = BuildTweakey(tweak, key)