Only skip _doReset if _key has not been changed since last reset.

yongmin1983 · Oct 27, 2016 · 7ff3a3c · 7ff3a3c
1 parent f643619
commit 7ff3a3c
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/aes.js b/src/aes.js
@@ -76,15 +76,18 @@
      */
     var AES = C_algo.AES = BlockCipher.extend({
         _doReset: function () {
-            if (this._nRounds) return;
+            // Skip reset of nRounds has been set before and key did not change
+            if (this._nRounds && this._keyPriorReset === this._key) {
+                return;
+            }
 
             // Shortcuts
-            var key = this._key;
+            var key = this._keyPriorReset = this._key;
             var keyWords = key.words;
             var keySize = key.sigBytes / 4;
 
             // Compute number of rounds
-            var nRounds = this._nRounds = keySize + 6
+            var nRounds = this._nRounds = keySize + 6;
 
             // Compute number of key schedule rows
             var ksRows = (nRounds + 1) * 4;