Add dependency on axolotl-crypto and add integration tests

Now that we can use real crypto in the integration tests, it's possible
to use real test vectors to show the implementation is correct.

Fixes #5

Author: joebandenburg

.travis.yml

@@ -1,4 +1,9 @@
 language: node_js
 node_js:
     - "0.10"
-before_install: npm install -g grunt-cli
+before_install:
+    - "npm install -g grunt-cli"
+    - "npm install -g bower"
+    - "export DISPLAY=:99.0"
+    - "sh -e /etc/init.d/xvfb start"
+    - "bower install"

Gruntfile.js

@@ -2,7 +2,7 @@
 
 module.exports = function(grunt) {
     grunt.loadNpmTasks("grunt-mocha-test"); // For server-side testing
-    grunt.loadNpmTasks("grunt-mocha"); // For client-side testing
+    grunt.loadNpmTasks("grunt-karma"); // For client-side testing
     grunt.loadNpmTasks("grunt-pure-cjs");
     grunt.loadNpmTasks("grunt-contrib-jshint");
     grunt.loadNpmTasks("grunt-blanket");
@@ -51,7 +51,7 @@ module.exports = function(grunt) {
                 }
             },
             integrationTests: {
-                src: ["test/integration/**/*.js"],
+                src: ["test/integration/node/**/*.js"],
                 options: {
                     clearRequireCache: true
                 }
@@ -66,11 +66,10 @@ module.exports = function(grunt) {
                 }
             }
         },
-        mocha: {
+        karma: {
             integrationTests: {
-                src: ["test/integration/**/*.html"],
                 options: {
-                    reporter: "Spec"
+                    configFile: "karma.conf.js"
                 }
             }
         },
@@ -89,6 +88,9 @@ module.exports = function(grunt) {
                         "traceur-runtime": {
                             global: "1",
                             id: "__external_2"
+                        },
+                        "axolotl-crypto": {
+                            global: "axolotlCrypto"
                         }
                     }
                 }
@@ -129,5 +131,5 @@ module.exports = function(grunt) {
     grunt.registerTask("test", ["clean", "check", "mochaTest:unitTests"]);
     grunt.registerTask("default", ["test"]);
     grunt.registerTask("dist", ["default", "traceur", "pure_cjs", "concat"]);
-    grunt.registerTask("integration-test", ["dist", "mochaTest:integrationTests", "mocha:integrationTests"]);
+    grunt.registerTask("integration-test", ["dist", "mochaTest:integrationTests", "karma:integrationTests"]);
 };

README.md

@@ -48,9 +48,9 @@ window.axolotl(...)
 ### Dependencies
 
 libaxolotl-javascript depends on [traceur-runtime](https://github.com/google/traceur-compiler) and
-[protobuf.js](https://github.com/dcodeIO/ProtoBuf.js). These dependencies are not included in the distributed package.
-If you installed libaxolotl-javascript using npm then there is nothing more you need to do - npm will download these
-dependencies for you.
+[protobuf.js](https://github.com/dcodeIO/ProtoBuf.js) and [cryptographic primitives](blob/master/doc/crypto.md).
+These dependencies are not included in the distributed package. If you installed libaxolotl-javascript using npm then
+there is nothing more you need to do - npm will download these dependencies for you.
 
 If you are using libaxolotl-javascript in the browser, you will have to provide the library's dependencies yourself. If
 you're using AMD, then simply provide the location of these dependencies in your AMD configuration. Otherwise, include
@@ -192,137 +192,12 @@ Name|Type|Description
 `identity`|Identity|The identity.
 `sessionState`|String|The serialised session state.
 
-### The Crypto interface
-
-You need to provide an implementation of the `Crypto` interface when instantiating Axolotl. This is an object that
-has the following methods.
-
-*Note that all methods may return a Promise if the operation is asynchronous.*
-
-#### generateKeyPair
-
-```
-generateKeyPair() → {KeyPair}
-```
-
-Generate a fresh, random [Curve25519](http://en.wikipedia.org/wiki/Curve25519) public/private key pair suitable for use
-with Diffie-Hellman key agreements. The returned private key should be an ArrayBuffer consisting of 32 bytes. The
-returned public key should be an ArrayBuffer consisting of 33 bytes, where the first byte is equal to `0x05`.
-
-#### calculateAgreement
-
-```
-calculateAgreement(theirPublicKey, ourPrivateKey) → {ArrayBuffer}
-```
-
-Compute a [Curve25519](http://en.wikipedia.org/wiki/Curve25519) Diffie-Hellman key agreement.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`theirPublicKey`|ArrayBuffer|Their 33 byte public key.
-`ourPrivateKey`|ArrayBuffer|Our 32 byte private key.
-
-#### randomBytes
-
-```
-randomBytes(byteCount) → {ArrayBuffer}
-```
-
-Generate `byteCount` bytes of cryptographically secure random data and return as an ArrayBuffer.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`byteCount`|Number|The number of bytes to generate.
-
-#### sign
-
-```
-sign(privateKey, dataToSign) → {ArrayBuffer}
-```
-
-Produce an [Ed25519](http://en.wikipedia.org/wiki/EdDSA) signature. The returned signature should be an ArrayBuffer
-consisting of 64 bytes.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`privateKey`|ArrayBuffer|The 32 byte private key to use to generate the signature.
-`dataToSign`|ArrayBuffer|The data to be signed. May be any length.
-
-#### verifySignature
-
-```
-verifySignature(publicKey, dataToSign, purportedSignature) → {Boolean}
-```
-
-Verify an [Ed25519](http://en.wikipedia.org/wiki/EdDSA) signature.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`privateKey`|ArrayBuffer|The 33 byte public half of the key used to produce the signature.
-`dataToSign`|ArrayBuffer|The data that was signed. May be any length.
-`purportedSignature`|ArrayBuffer|The purported signature to check.
-
-#### hmac
-
-```
-hmac(key, data) → {ArrayBuffer}
-```
-
-Produce a HMAC-HASH using SHA-256. The returned ArrayBuffer should consist of 32 bytes.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`key`|ArrayBuffer|The mac key. May be any length.
-`data`|ArrayBuffer|The data to be hashed. May be any length.
-
-#### encrypt
-
-```
-encrypt(key, plaintext, iv) → {ArrayBuffer}
-```
-
-Encrypt the `plaintext` using AES-256-CBC.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`key`|ArrayBuffer|The 32 byte cipher key.
-`plaintext`|ArrayBuffer|The data to be encrypted. May be any length.
-`iv`|ArrayBuffer|A 16 byte random initialisation vector.
-
-#### decrypt
-
-```
-decrypt(key, ciphertext, iv) → {ArrayBuffer}
-```
-
-Decrypt the `ciphertext` using AES-256-CBC.
-
-##### Parameters
-
-Name|Type|Description
-:---|:---|:----------
-`key`|ArrayBuffer|The 32 byte cipher key used to encrypt the data.
-`ciphertext`|ArrayBuffer|The data to be decrypted. Should have a length that is a multiple of 16 bytes.
-`iv`|ArrayBuffer|The 16 byte initialisation vector used to encrypt the data.
-
 ### Using Axolotl
 
 Start by instantiating Axolotl:
 
 ```javascript
-var axol = axolotl(crypto, store);
+var axol = axolotl(store);
 ```
 
 When your application is first installed, the client will likely need to register with the server. To do this, a number

bower.json

@@ -34,6 +34,7 @@
   ],
   "dependencies": {
     "protobuf": "~3.8.2",
-    "traceur-runtime": "~0.0.79"
+    "traceur-runtime": "~0.0.79",
+    "axolotl-crypto": "~1.1.0"
   }
 }