mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Fixup curve25519 module

Browse source 
Rename methods on the curve25519 interface to be a bit more high level.
Cleanup emscripten wrapper class, wrap long lines and such. Also add a
grunt task alias for building the emscripten compiled curve
implementation.
This commit is contained in:
lilia 2014-11-08 23:41:14 -08:00
parent a1a528ccdd
commit 2f58ea5f3a
6 changed files with 74 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

8
js/crypto.js
View file

@ -83,7 +83,7 @@
throw new Error("Invalid private key");
}
return curve25519().privToPub(privKey).then(function(raw_keys) {
return curve25519().keyPair(privKey).then(function(raw_keys) {
// prepend version byte
var origPub = new Uint8Array(raw_keys.pubKey);
var pub = new Uint8Array(33);
@ -101,7 +101,7 @@
if (pubKey === undefined || pubKey.byteLength != 32)
throw new Error("Invalid public key");
return curve25519().ECDHE(pubKey, privKey);
return curve25519().sharedSecret(pubKey, privKey);
},
Ed25519Sign: function(privKey, message) {
if (privKey === undefined || privKey.byteLength != 32)
@ -110,7 +110,7 @@
if (message === undefined)
throw new Error("Invalid message");
return curve25519().Ed25519Sign(privKey, message);
return curve25519().sign(privKey, message);
},
Ed25519Verify: function(pubKey, msg, sig) {
pubKey = validatePubKeyFormat(pubKey);
@ -124,7 +124,7 @@
if (sig === undefined || sig.byteLength != 64)
throw new Error("Invalid signature");
return curve25519().Ed25519Verify(pubKey, msg, sig);
return curve25519().verify(pubKey, msg, sig);
}
};

39
js/curve25519_compiled.js
View file

@ -2919,49 +2919,52 @@ run();
basepoint[0] = 9;
window.curve25519 = {
privToPub: function(privKey) {
keyPair: function(privKey) {
var priv = new Uint8Array(privKey);
priv[0] &= 248;
priv[31] &= 127;
priv[31] |= 64
// Where to store the result
var pubKey = new Uint8Array(32);
//var publicKey_ptr = Module._malloc(32);
var publicKey_ptr = _allocate(pubKey);
var publicKey_ptr = Module._malloc(32);
// Get a pointer to the private key
var privateKey_ptr = _allocate(priv);
// The basepoint for generating public keys is 0x09 followed by 31 null bytes
// The basepoint for generating public keys
var basepoint_ptr = _allocate(basepoint);
// The return value is just 0, the operation is done in place
var err = Module._curve25519_donna(publicKey_ptr, privateKey_ptr, basepoint_ptr);
var err = Module._curve25519_donna(publicKey_ptr,
privateKey_ptr,
basepoint_ptr);
var res = new Uint8Array(32);
_readBytes(publicKey_ptr, 32, res);
return Promise.resolve({ pubKey: res.buffer, privKey: privKey });
},
ECDHE: function(pubKey, privKey) {
sharedSecret: function(pubKey, privKey) {
// Where to store the result
var sharedKey_ptr = Module._malloc(32);
// Get a pointer to our private key
var privateKey_ptr = _allocate(new Uint8Array(privKey));
// Get a pointer to their public key, the basepoint when you're generating a shared secret
// Get a pointer to their public key, the basepoint when you're
// generating a shared secret
var basepoint_ptr = _allocate(new Uint8Array(pubKey));
// Return value is 0 here too of course
var err = Module._curve25519_donna(sharedKey_ptr, privateKey_ptr, basepoint_ptr);
var err = Module._curve25519_donna(sharedKey_ptr,
privateKey_ptr,
basepoint_ptr);
var res = new Uint8Array(32);
_readBytes(sharedKey_ptr, 32, res);
return Promise.resolve(res.buffer);
},
Ed25519Sign: function(privKey, message) {
sign: function(privKey, message) {
// Where to store the result
var signature_ptr = Module._malloc(32);
@ -2971,13 +2974,16 @@ run();
// Get a pointer to the message
var message_ptr = _allocate(new Uint8Array(message));
var err = Module._curve25519_sign(signature_ptr, privateKey_ptr, message_ptr, message.byteLength);
var err = Module._curve25519_sign(signature_ptr,
privateKey_ptr,
message_ptr,
message.byteLength);
var res = new Uint8Array(64);
_readBytes(signature_ptr, 64, res);
return Promise.resolve(res.buffer);
},
Ed25519Verify: function(pubKey, message, sig) {
verify: function(pubKey, message, sig) {
// Get a pointer to their public key
var publicKey_ptr = _allocate(new Uint8Array(pubKey));
@ -2987,12 +2993,17 @@ run();
// Get a pointer to the message
var message_ptr = _allocate(new Uint8Array(message));
var res = Module._curve25519_verify(signature_ptr, publicKey_ptr, message_ptr, message.byteLength);
var res = Module._curve25519_verify(signature_ptr,
publicKey_ptr,
message_ptr,
message.byteLength);
return new Promise(function(resolve, reject) {
if (res !== 0) {
reject(new Error("Invalid signature"));
} else {
resolve();
}
resolve();
});
}
};

8
js/nativeclient.js
View file

@ -65,7 +65,7 @@
};
window.textsecure.nativeclient = {
privToPub: function(priv) {
keyPair: function(priv) {
return postMessage({command: "bytesToPriv", priv: priv}).then(function(message) {
var priv = message.res.slice(0, 32);
return postMessage({command: "privToPub", priv: priv}).then(function(message) {
@ -73,17 +73,17 @@
});
});
},
ECDHE: function(pub, priv) {
sharedSecret: function(pub, priv) {
return postMessage({command: "ECDHE", pub: pub, priv: priv}).then(function(message) {
return message.res.slice(0, 32);
});
},
Ed25519Sign: function(priv, msg) {
sign: function(priv, msg) {
return postMessage({command: "Ed25519Sign", priv: priv, msg: msg}).then(function(message) {
return message.res;
});
},
Ed25519Verify: function(pub, msg, sig) {
verify: function(pub, msg, sig) {
return postMessage({command: "Ed25519Verify", pub: pub, msg: msg, sig: sig}).then(function(message) {
if (!message.res)
throw new Error("Invalid signature");