Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement nacl.sign.keyPair.fromSeed. #46

Merged
merged 2 commits into from
Aug 3, 2014
Merged

Implement nacl.sign.keyPair.fromSeed. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6be01af
Implement nacl.sign.keyPair.fromSeed.
dchest Jul 27, 2014
311508f
Docs: clarify fromSecretKey.
dchest Jul 31, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,16 @@ Generates new random key pair for signing and returns it as an object with

#### nacl.sign.keyPair.fromSecretKey(secretKey)

Returns a signing key pair with public key corresponding to the given secret key.
Returns a signing key pair with public key corresponding to the given
64-byte secret key. The secret key must have been generated by
`nacl.sign.keyPair` or `nacl.sign.keyPair.fromSeed`.

#### nacl.sign.keyPair.fromSeed(seed)

Returns a new signing key pair generated deterministically from a 32-byte seed.
The seed must contain enough entropy to be secure. This method is not
recommended for general use: instead, use `nacl.sign.keyPair` to generate a new
key pair from a random seed.

#### nacl.sign(message, secretKey)

Expand Down
15 changes: 13 additions & 2 deletions nacl-fast.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,12 +1141,12 @@ function scalarbase(p, s) {
scalarmult(p, q, s);
}

function crypto_sign_keypair(pk, sk) {
function crypto_sign_keypair(pk, sk, seeded) {
var d = new Uint8Array(64);
var p = [gf(), gf(), gf(), gf()];
var i;

randombytes(sk, 32);
if (!seeded) randombytes(sk, 32);
crypto_hash(d, sk, 32);
d[0] &= 248;
d[31] &= 127;
Expand Down Expand Up @@ -1569,6 +1569,17 @@ nacl.sign.keyPair.fromSecretKey = function(secretKey) {
return {publicKey: pk, secretKey: secretKey};
};

nacl.sign.keyPair.fromSeed = function(seed) {
checkArrayTypes(seed);
if (seed.length !== 32)
throw new Error('bad seed size');
var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
for (var i = 0; i < 32; i++) sk[i] = seed[i];
crypto_sign_keypair(pk, sk, true);
return {publicKey: pk, secretKey: sk};
};

nacl.sign.publicKeyLength = crypto_sign_PUBLICKEYBYTES;
nacl.sign.secretKeyLength = crypto_sign_SECRETKEYBYTES;
nacl.sign.signatureLength = crypto_sign_BYTES;
Expand Down
2 changes: 1 addition & 1 deletion nacl-fast.min.js
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 13 additions & 2 deletions nacl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,12 +703,12 @@ function scalarbase(p, s) {
scalarmult(p, q, s);
}

function crypto_sign_keypair(pk, sk) {
function crypto_sign_keypair(pk, sk, seeded) {
var d = new Uint8Array(64);
var p = [gf(), gf(), gf(), gf()];
var i;

randombytes(sk, 32);
if (!seeded) randombytes(sk, 32);
crypto_hash(d, sk, 32);
d[0] &= 248;
d[31] &= 127;
Expand Down Expand Up @@ -1131,6 +1131,17 @@ nacl.sign.keyPair.fromSecretKey = function(secretKey) {
return {publicKey: pk, secretKey: secretKey};
};

nacl.sign.keyPair.fromSeed = function(seed) {
checkArrayTypes(seed);
if (seed.length !== 32)
throw new Error('bad seed size');
var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
for (var i = 0; i < 32; i++) sk[i] = seed[i];
crypto_sign_keypair(pk, sk, true);
return {publicKey: pk, secretKey: sk};
};

nacl.sign.publicKeyLength = crypto_sign_PUBLICKEYBYTES;
nacl.sign.secretKeyLength = crypto_sign_SECRETKEYBYTES;
nacl.sign.signatureLength = crypto_sign_BYTES;
Expand Down