summaryrefslogtreecommitdiff
path: root/src/ext/ed25519/ref10/keypair.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/ext/ed25519/ref10/keypair.c')
-rw-r--r--src/ext/ed25519/ref10/keypair.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/src/ext/ed25519/ref10/keypair.c b/src/ext/ed25519/ref10/keypair.c
index ac6cea2b7a..26a17272d7 100644
--- a/src/ext/ed25519/ref10/keypair.c
+++ b/src/ext/ed25519/ref10/keypair.c
@@ -1,15 +1,23 @@
+/* Modified for Tor: new API, 32-byte secret keys. */
#include <string.h>
#include "randombytes.h"
#include "crypto_sign.h"
#include "crypto_hash_sha512.h"
#include "ge.h"
-int crypto_sign_keypair(unsigned char *pk,unsigned char *sk)
+int
+crypto_sign_seckey(unsigned char *sk)
+{
+ randombytes(sk,32);
+
+ return 0;
+}
+
+int crypto_sign_pubkey(unsigned char *pk,const unsigned char *sk)
{
unsigned char az[64];
ge_p3 A;
- randombytes(sk,32);
crypto_hash_sha512(az,sk,32);
az[0] &= 248;
az[31] &= 63;
@@ -18,6 +26,15 @@ int crypto_sign_keypair(unsigned char *pk,unsigned char *sk)
ge_scalarmult_base(&A,az);
ge_p3_tobytes(pk,&A);
- memmove(sk + 32,pk,32);
return 0;
}
+
+
+int crypto_sign_keypair(unsigned char *pk,unsigned char *sk)
+{
+ crypto_sign_seckey(sk);
+ crypto_sign_pubkey(pk, sk);
+
+ return 0;
+}
+