sage.crypto.block_cipher: Modularization fix

Author: Matthias Koeppe

src/sage/crypto/block_cipher/des.py

@@ -78,7 +78,7 @@
 from sage.rings.integer_ring import ZZ
 from sage.modules.free_module_element import vector
 from sage.rings.finite_rings.finite_field_constructor import GF
-from sage.modules.vector_mod2_dense import Vector_mod2_dense
+from sage.structure.element import Vector
 from sage.rings.integer import Integer
 from sage.crypto.sboxes import DES_S1_1, DES_S1_2, DES_S1_3, DES_S1_4
 from sage.crypto.sboxes import DES_S2_1, DES_S2_2, DES_S2_3, DES_S2_4
@@ -512,7 +512,7 @@ def encrypt(self, plaintext, key):
             sage: des.encrypt(P, K56) == C
             True
         """
-        if isinstance(plaintext, (list, tuple, Vector_mod2_dense)):
+        if isinstance(plaintext, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(plaintext, (Integer, int)):
             inputType = 'integer'
@@ -569,7 +569,7 @@ def decrypt(self, ciphertext, key):
             sage: des.decrypt(C, K56).hex() == P
             True
         """
-        if isinstance(ciphertext, (list, tuple, Vector_mod2_dense)):
+        if isinstance(ciphertext, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(ciphertext, (Integer, int)):
             inputType = 'integer'
@@ -869,7 +869,7 @@ def __call__(self, key):
             pass a ``masterKey`` value on initialisation. Otherwise you can
             omit ``masterKey`` and pass a key when you call the object.
         """
-        if isinstance(key, (list, tuple, Vector_mod2_dense)):
+        if isinstance(key, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(key, (Integer, int)):
             inputType = 'integer'

src/sage/crypto/block_cipher/present.py

@@ -62,13 +62,11 @@
 from sage.structure.sage_object import SageObject
 from sage.rings.integer_ring import ZZ
 from sage.rings.integer import Integer
-from sage.misc.lazy_import import lazy_import
 from sage.modules.free_module_element import vector
 from sage.rings.finite_rings.finite_field_constructor import GF
+from sage.structure.element import Vector
 from sage.crypto.sboxes import PRESENT as PRESENTSBOX
 
-lazy_import('sage.modules.vector_mod2_dense', 'Vector_mod2_dense')
-
 
 def _smallscale_present_linearlayer(nsboxes=16):
     """
@@ -420,7 +418,7 @@ def encrypt(self, plaintext, key):
         \leq 32` and current STATE `b_{63} \dots b_0`, addRoundkey consists of
         the operation for `0 \leq j \leq 63`, `b_j = b_j \oplus \kappa^i_j`.
         """
-        if isinstance(plaintext, (list, tuple, Vector_mod2_dense)):
+        if isinstance(plaintext, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(plaintext, (Integer, int)):
             inputType = 'integer'
@@ -476,7 +474,7 @@ def decrypt(self, ciphertext, key):
             sage: present.decrypt(c4, k4) == p4
             True
        """
-        if isinstance(ciphertext, (list, tuple, Vector_mod2_dense)):
+        if isinstance(ciphertext, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(ciphertext, (Integer, int)):
             inputType = 'integer'
@@ -776,7 +774,7 @@ def __call__(self, K):
             pass a ``master_key`` value on initialisation. Otherwise you can
             omit ``master_key`` and pass a key when you call the object.
         """
-        if isinstance(K, (list, tuple, Vector_mod2_dense)):
+        if isinstance(K, (list, tuple, Vector)):
             inputType = 'vector'
         elif isinstance(K, (Integer, int)):
             inputType = 'integer'