[implem-python] Renommage du module TBC

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

1 files changed, 9 insertions, 9 deletions

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)