Merge branch 'release/3.1.5'

evanvosberg · evanvosberg · commit a94ba57c7a77 · 2015-05-28T22:18:12.000+02:00
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # crypto-js
 
-Modularized port of googlecode project crypto-js.
+JavaScript library of crypto standards.
 
 ## Node.js (Install)
 
@@ -85,6 +85,7 @@ require(["crypto-js"], function (CryptoJS) {
     var encrypted = CryptoJS.AES(...);
     var encrypted = CryptoJS.SHA256(...);
 </script>
+```
 
 ## API
 
diff --git a/bower.json b/bower.json
@@ -1,11 +1,12 @@
 {
   "name": "crypto-js",
-  "version": "3.1.4",
-  "description": "Modularized port of googlecode project crypto-js.",
-  "homepage": "http://github.com/evanvosberg/crypto-js",
+  "version": "3.1.5",
+  "description": "JavaScript library of crypto standards.",
+  "license": "MIT",
+  "homepage": "http://github.com/brix/crypto-js",
   "repository": {
     "type": "git",
-    "url": "http://github.com/evanvosberg/crypto-js.git"
+    "url": "http://github.com/brix/crypto-js.git"
   },
   "keywords": [
     "security",
diff --git a/core.js b/core.js
@@ -225,14 +225,11 @@
 	                    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;
 
diff --git a/crypto-js.js b/crypto-js.js
@@ -225,14 +225,11 @@
 	                    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;
 
diff --git a/package.json b/package.json
@@ -1,15 +1,16 @@
 {
   "name": "crypto-js",
-  "version": "3.1.4",
-  "description": "Modularized port of googlecode project crypto-js.",
+  "version": "3.1.5",
+  "description": "JavaScript library of crypto standards.",
+  "license": "MIT",
   "author": {
     "name": "Evan Vosberg",
     "url": "http://github.com/evanvosberg"
   },
-  "homepage": "http://github.com/evanvosberg/crypto-js",
+  "homepage": "http://github.com/brix/crypto-js",
   "repository": {
     "type": "git",
-    "url": "http://github.com/evanvosberg/crypto-js.git"
+    "url": "http://github.com/brix/crypto-js.git"
   },
   "keywords": [
     "security",

Original file line number	Diff line number	Diff line change
`@@ -225,14 +225,11 @@`
`225`	`225`	`var thatByte = (thatWords[i >>> 2] >>> (24 - (i % 4) * 8)) & 0xff;`
`226`	`226`	`thisWords[(thisSigBytes + i) >>> 2] \|= thatByte << (24 - ((thisSigBytes + i) % 4) * 8);`
`227`	`227`	`}`
`228`		`- } else if (thatWords.length > 0xffff) {`
	`228`	`+ } else {`
`229`	`229`	`// Copy one word at a time`
`230`	`230`	`for (var i = 0; i < thatSigBytes; i += 4) {`
`231`	`231`	`thisWords[(thisSigBytes + i) >>> 2] = thatWords[i >>> 2];`
`232`	`232`	`}`
`233`		`- } else {`
`234`		`- // Copy all words at once`
`235`		`- thisWords.push.apply(thisWords, thatWords);`
`236`	`233`	`}`
`237`	`234`	`this.sigBytes += thatSigBytes;`
`238`	`235`