Remember creator on mode object and add test case.

448168930 · Dec 14, 2016 · a5214c4 · a5214c4
1 parent d887ede
commit a5214c4
Show file tree

Hide file tree

Showing 3 changed files with 526 additions and 2 deletions.
diff --git a/src/cipher-core.js b/src/cipher-core.js
@@ -454,11 +454,12 @@ CryptoJS.lib.Cipher || (function (undefined) {
                 // Keep at least one block in the buffer for unpadding
                 this._minBufferSize = 1;
             }
-            if (this._mode && this._modeCreator == modeCreator) {
+
+            if (this._mode && this._mode.__creator == modeCreator) {
                 this._mode.init(this, iv && iv.words);
             } else {
                 this._mode = modeCreator.call(mode, this, iv && iv.words);
-                this._modeCreator = modeCreator;
+                this._mode.__creator = modeCreator;
             }
         },