Merge branch 'master' of github.com:jedmccaleb/NewCoin

grunt.js

@@ -14,19 +14,20 @@ module.exports = function(grunt) {
       sjcl: {
         src: [
           "src/js/sjcl/core/sjcl.js",
-//          "src/js/sjcl/core/aes.js",
+          "src/js/sjcl/core/aes.js",
           "src/js/sjcl/core/bitArray.js",
           "src/js/sjcl/core/codecString.js",
           "src/js/sjcl/core/codecHex.js",
           "src/js/sjcl/core/codecBase64.js",
           "src/js/sjcl/core/codecBytes.js",
           "src/js/sjcl/core/sha256.js",
+          "src/js/sjcl/core/sha512.js",
           "src/js/sjcl/core/sha1.js",
-//          "src/js/sjcl/core/ccm.js",
+          "src/js/sjcl/core/ccm.js",
 //          "src/js/sjcl/core/cbc.js",
 //          "src/js/sjcl/core/ocb2.js",
-//          "src/js/sjcl/core/hmac.js",
-//          "src/js/sjcl/core/pbkdf2.js",
+          "src/js/sjcl/core/hmac.js",
+          "src/js/sjcl/core/pbkdf2.js",
           "src/js/sjcl/core/random.js",
           "src/js/sjcl/core/convenience.js",
           "src/js/sjcl/core/bn.js",

src/js/index.js

@@ -1,4 +1,13 @@
 exports.Remote = require('./remote').Remote;
 exports.Amount = require('./amount').Amount;
 exports.UInt160 = require('./amount').UInt160;
-exports.Seed = require('./amount').Seed;
+exports.Seed = require('./amount').Seed;
+
+// Important: We do not guarantee any specific version of SJCL or for any
+// specific features to be included. The version and configuration may change at
+// any time without warning.
+//
+// However, for programs that are tied to a specific version of ripple.js like
+// the official client, it makes sense to expose the SJCL instance so we don't
+// have to include it twice.
+exports.sjcl = require('../../build/sjcl');