Import 2.5.1

sophiebremer · Jul 7, 2022 · 2eca048 · 2eca048
1 parent 8f174bd
commit 2eca048
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/builder/builder.php b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 $copyrightInfo = '/*
- * Crypto-JS v2.5.0
+ * Crypto-JS v2.5.1
  * http://code.google.com/p/crypto-js/
  * (c) 2009-2011 by Jeff Mott. All rights reserved.
  * http://code.google.com/p/crypto-js/wiki/License

diff --git a/src/DES.js b/src/DES.js
@@ -894,7 +894,7 @@
     /**
      * DES cipher
      */
-    C.DES = {
+    var DES = C.DES = {
         _blockSize : 2,
 
         _keyschedule : null,
@@ -910,7 +910,7 @@
             options = options || {};
 
             // Determine mode
-            var mode = options.mode || C.mode.OFB;
+            var mode = options.mode || new C.mode.OFB;
 
             // Allow mode to override options
             if (mode.fixOptions)
@@ -952,11 +952,11 @@
             this._state.finalPerm(message, offset);
         },
 
-        decrypt : function(message, password, options) {
+        decrypt : function(ciphertext, password, options) {
             options = options || {};
 
             // Determine mode
-            var mode = options.mode || C.mode.OFB;
+            var mode = options.mode || new C.mode.OFB;
 
             // Allow mode to override options
             if (mode.fixOptions)

diff --git a/test/DES-test.js b/test/DES-test.js
@@ -126,6 +126,8 @@ TestSuite.add(new YAHOO.tool.TestCase({
             Assert.areEqual(inp.toString(), out.toString(),
                     "DES E(D(x) failed: " + inp.toString() + " became "
                             + out.toString());
+
+            Assert.areEqual(inp.toString(), Crypto.DES.decrypt(Crypto.DES.encrypt(inp.slice(0), key), key, { asBytes: true }).toString());
         }
     }