Bugfix for #378

Makefile

@@ -81,7 +81,8 @@ TEST_SCRIPTS= $(TEST_COMMON) \
               test/sha512_huge_test_messages.js test/sha512_huge_test.js \
               test/sha512_test_brute_force.js \
               test/srp_vectors.js test/srp_test.js \
-	      test/z85_vectors.js test/z85_test.js
+	          test/z85_vectors.js test/z85_test.js \
+              test/core_test.js
 
 # Run all tests in node.js.
 test: sjcl.js $(TEST_SCRIPTS) test/run_tests_node.js

config.mk

@@ -1,2 +1,2 @@
-SOURCES= core/sjcl.js core/aes.js core/bitArray.js core/codecString.js core/codecHex.js core/codecBase32.js core/codecBase64.js core/sha256.js core/ccm.js core/ocb2.js core/gcm.js core/hmac.js core/pbkdf2.js core/random.js core/convenience.js core/exports.js 
+SOURCES= core/header.js core/sjcl.js core/aes.js core/bitArray.js core/codecString.js core/codecHex.js core/codecBase32.js core/codecBase64.js core/sha256.js core/ccm.js core/ocb2.js core/gcm.js core/hmac.js core/pbkdf2.js core/random.js core/convenience.js core/exports.js core/footer.js
 COMPRESS= core_closure.js

core/footer.js

@@ -0,0 +1 @@
+}()); /* This is opened by header.js */

core/header.js

@@ -0,0 +1,16 @@
+/** @fileOverview Javascript cryptography implementation.
+ *
+ * Crush to remove comments, shorten variable names and
+ * generally reduce transmission size.
+ *
+ * @author Emily Stark
+ * @author Mike Hamburg
+ * @author Dan Boneh
+ */
+
+"use strict";
+/*jslint indent: 2, bitwise: false, nomen: false, plusplus: false, white: false, regexp: false */
+/*global document, window, escape, unescape, module, require, Uint32Array */
+
+/* sjcl.js must be a module to ensure that crushed names do not interfere with variable names */
+(function () { /* This will be closed by footer.js */

core/sjcl.js

@@ -1,17 +1,3 @@
-/** @fileOverview Javascript cryptography implementation.
- *
- * Crush to remove comments, shorten variable names and
- * generally reduce transmission size.
- *
- * @author Emily Stark
- * @author Mike Hamburg
- * @author Dan Boneh
- */
-
-"use strict";
-/*jslint indent: 2, bitwise: false, nomen: false, plusplus: false, white: false, regexp: false */
-/*global document, window, escape, unescape, module, require, Uint32Array */
-
 /**
  * The Stanford Javascript Crypto Library, top-level namespace.
  * @namespace

test/aes_test.js

@@ -15,4 +15,4 @@ new sjcl.test.TestCase("AES official known-answer tests", function (cb) {
     this.require(sjcl.bitArray.equal(aes.decrypt(tv.ct), tv.pt), "decrypt "+len+" #"+i);
   }
   cb && cb();
-});
+});

test/core_test.js

@@ -0,0 +1,6 @@
+new sjcl.test.TestCase("variable names that share space with compressed variable names", function (cb) {
+  t = 10; // assign anything to t
+  u = 10; // assign anything to u
+  this.pass()
+  cb && cb();
+});