TeaSpeak/ed25519
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add_scalar now generates a new salt

Browse Source
This commit is contained in:
Orson Peters 2013-04-11 20:17:21 +02:00
parent 25176531a4
commit 1e49c17da6
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ed25519_32.dll
View File

Binary file not shown.

BIN
ed25519_64.dll
View File

Binary file not shown.

11
src/add_scalar.c
View File

@ -1,4 +1,5 @@
#include "ed25519.h" #include "ed25519.h"
#include "sha512.h"
#include "ge.h" #include "ge.h"
#include "sc.h" #include "sc.h"
@ -7,7 +8,8 @@
void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, const unsigned char *scalar) { void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, const unsigned char *scalar) {
const unsigned char SC_1[32] = {1}; /* scalar with value 1 */ const unsigned char SC_1[32] = {1}; /* scalar with value 1 */
unsigned char n[32]; unsigned char n[32];
unsigned char salt[64];
ge_p3 nB; ge_p3 nB;
ge_p1p1 A_p1p1; ge_p1p1 A_p1p1;
ge_p3 A; ge_p3 A;
@ -23,8 +25,15 @@ void ed25519_add_scalar(unsigned char *public_key, unsigned char *private_key, c
n[31] = scalar[31] & 127; n[31] = scalar[31] & 127;
/* private key: a = n + t */ /* private key: a = n + t */
/* we also create a new salt, just to be sure */
if (private_key) { if (private_key) {
sc_muladd(private_key, SC_1, n, private_key); sc_muladd(private_key, SC_1, n, private_key);
/* generate new salt as the last 32 bytes of SHA512(new_private_key, old_salt) */
sha512(private_key, 64, salt);
for (i = 0; i < 32; ++i) {
private_key[i + 32] = salt[i + 32];
}
} }
/* public key: A = nB + T */ /* public key: A = nB + T */