Mercurial Repositories > eric / file diff

--- a/eric6/Utilities/crypto/py3AES.py	Thu Apr 08 17:27:12 2021 +0200
+++ b/eric6/Utilities/crypto/py3AES.py	Thu Apr 08 18:27:47 2021 +0200
@@ -507,6 +507,9 @@
         @return encrypted data (bytes)
         @exception ValueError key size is invalid
         """
+        if size not in self.KeySize.values():
+            raise ValueError("Wrong key size given ({0}).".format(size))
+        
         output = bytearray(16)
         # the number of rounds
         nbrRounds = 0
@@ -517,10 +520,8 @@
             nbrRounds = 10
         elif size == self.KeySize["SIZE_192"]:
             nbrRounds = 12
-        elif size == self.KeySize["SIZE_256"]:
+        else:
             nbrRounds = 14
-        else:
-            raise ValueError("Wrong key size given ({0}).".format(size))
 
         # the expanded keySize
         expandedKeySize = 16 * (nbrRounds + 1)
@@ -564,20 +565,22 @@
         @return decrypted data (bytes)
         @exception ValueError key size is invalid
         """
+        if size not in self.KeySize.values():
+            raise ValueError("Wrong key size given ({0}).".format(size))
+        
         output = bytearray(16)
         # the number of rounds
         nbrRounds = 0
         # the 128 bit block to decode
         block = bytearray(16)
         # set the number of rounds
+        
         if size == self.KeySize["SIZE_128"]:
             nbrRounds = 10
         elif size == self.KeySize["SIZE_192"]:
             nbrRounds = 12
-        elif size == self.KeySize["SIZE_256"]:
+        else:
             nbrRounds = 14
-        else:
-            raise ValueError("Wrong key size given ({0}).".format(size))
 
         # the expanded keySize
         expandedKeySize = 16 * (nbrRounds + 1)