Merge branch 'master' into draft/python

Author: martinthomson

nodejs/decrypt-dh.js

@@ -4,9 +4,9 @@ var base64 = require('urlsafe-base64');
 var crypto = require('crypto');
 var ece = require('./ece.js');
 
-if (process.argv.length < 7) {
+if (process.argv.length < 6) {
   console.warn('Usage: ' + process.argv.slice(0, 2).join(' ') +
-               ' <receiver-private> <receiver-public> <sender-public> <salt> <message> [JSON args]');
+               ' <auth-secret> <receiver-private> <receiver-public> <message> [JSON args]');
   process.exit(2);
 }
 
@@ -16,14 +16,14 @@ var receiver = crypto.createECDH('prime256v1');
 // 2. it barfs when you try to access the public key, even after you set it
 // This hack squelches the complaints at the cost of a few wasted cycles
 receiver.generateKeys();
-receiver.setPublicKey(base64.decode(process.argv[3]));
-receiver.setPrivateKey(base64.decode(process.argv[2]));
-ece.saveKey('keyid', receiver, "P-256");
+receiver.setPublicKey(base64.decode(process.argv[4]));
+receiver.setPrivateKey(base64.decode(process.argv[3]));
+var keymap = {};
 
 var params = {
-  keyid: 'keyid',
-  dh: process.argv[4],
-  salt: process.argv[5]
+  version: 'aes128gcm',
+  authSecret: process.argv[2],
+  privateKey: receiver
 };
 
 if (process.argv.length > 7) {
@@ -32,9 +32,10 @@ if (process.argv.length > 7) {
     params[k] = extra[k];
   });
 }
+keymap[params.keyid] = receiver;
 
 console.log("Params: " + JSON.stringify(params, null, 2));
-var result = ece.decrypt(base64.decode(process.argv[6]), params);
+var result = ece.decrypt(base64.decode(process.argv[5]), params);
 
 console.log(base64.encode(result));
 console.log(result.toString('utf-8'));

nodejs/decrypt.js

@@ -4,26 +4,26 @@ var base64 = require('urlsafe-base64');
 var crypto = require('crypto');
 var ece = require('./ece.js');
 
-if (process.argv.length < 5) {
+if (process.argv.length < 4) {
   console.warn('Usage: ' + process.argv.slice(0, 2).join(' ') +
-               ' <key> <salt> <message> [JSON args]');
+               ' <key> <message> [JSON args]');
   process.exit(2);
 }
 
 var params = {
-  key: process.argv[2],
-  salt: process.argv[3]
+  version: 'aes128gcm',
+  key: process.argv[2]
 };
 
-if (process.argv.length > 5) {
-  var extra = JSON.parse(process.argv[5]);
+if (process.argv.length > 4) {
+  var extra = JSON.parse(process.argv[4]);
   Object.keys(extra).forEach(function(k) {
     params[k] = extra[k];
   });
 }
 
 console.log("Params: " + JSON.stringify(params, null, 2));
-var result = ece.decrypt(base64.decode(process.argv[4]), params);
+var result = ece.decrypt(base64.decode(process.argv[3]), params);
 
 console.log(base64.encode(result));
 console.log(result.toString('utf-8'));