Fix bug that breaks HMAC routines

hxw · hxw · commit f50b05140188 · 2015-04-15T17:41:06.000+08:00
Some references: (until googlecode shuts down) https://code.google.com/p/crypto-js/issues/detail?id=84 https://crypto-js.googlecode.com/svn-history/r667/branches/3.x/src/core.js Signed-off-by: Christopher Hall <hsw@bitmark.com>
diff --git a/src/core.js b/src/core.js
@@ -210,14 +210,11 @@ var CryptoJS = CryptoJS || (function (Math, undefined) {
                     var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;
                     thisWords[(thisSigBytes + i) >>> 2] |= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);
                 }
-            } else if (thatWords.length > 0xffff) {
+            } else {
                 // Copy one word at a time
                 for (var i = 0; i < thatSigBytes; i += 4) {
                     thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];
                 }
-            } else {
-                // Copy all words at once
-                thisWords.push.apply(thisWords, thatWords);
             }
             this.sigBytes += thatSigBytes;
 

Original file line number	Diff line number	Diff line change
`@@ -210,14 +210,11 @@ var CryptoJS = CryptoJS \|\| (function (Math, undefined) {`
`210`	`210`	`var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;`
`211`	`211`	`thisWords[(thisSigBytes + i) >>> 2] \|= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);`
`212`	`212`	`}`
`213`		`- } else if (thatWords.length > 0xffff) {`
	`213`	`+ } else {`
`214`	`214`	`// Copy one word at a time`
`215`	`215`	`for (var i = 0; i < thatSigBytes; i += 4) {`
`216`	`216`	`thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];`
`217`	`217`	`}`
`218`		`- } else {`
`219`		`- // Copy all words at once`
`220`		`- thisWords.push.apply(thisWords, thatWords);`
`221`	`218`	`}`
`222`	`219`	`this.sigBytes += thatSigBytes;`
`223`	`220`