nostrdb

commit 98a5275bd77898e13c243343555b1c4044e79368
parent 7ad51bd79ba9fc5dbafe46a3e86b2bfc4a83ae45
Author: William Casarin <jb55@jb55.com>
Date:   Tue, 25 Jul 2023 13:10:34 -0700

ndb: expose keypair struct

this is needed to decode keys in swift

Diffstat:
M
nostrdb.c
 | 
20
++++++++------------
M
nostrdb.h
 | 
6
+++++-

2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/nostrdb.c b/nostrdb.c
@@ -12,12 +12,6 @@
 #include "secp256k1_ecdh.h"
 #include "secp256k1_schnorrsig.h"
 
-struct ndb_keypair {
-	unsigned char pubkey[32];
-	unsigned char secret[32];
-	secp256k1_keypair pair;
-};
-
 struct ndb_json_parser {
 	const char *json;
 	int json_len;
@@ -292,6 +286,7 @@ int ndb_sign_id(struct ndb_keypair *keypair, unsigned char id[32],
 		unsigned char sig[64])
 {
 	unsigned char aux[32];
+	secp256k1_keypair *pair = (secp256k1_keypair*) keypair->pair;
 
 	if (!fill_random(aux, sizeof(aux)))
 		return 0;
@@ -299,26 +294,27 @@ int ndb_sign_id(struct ndb_keypair *keypair, unsigned char id[32],
 	secp256k1_context *ctx =
 		secp256k1_context_create(SECP256K1_CONTEXT_NONE);
 
-	return secp256k1_schnorrsig_sign32(ctx, sig, id, &keypair->pair, aux);
+	return secp256k1_schnorrsig_sign32(ctx, sig, id, pair, aux);
 }
 
-int ndb_create_keypair(struct ndb_keypair *key)
+int ndb_create_keypair(struct ndb_keypair *kp)
 {
+	secp256k1_keypair *keypair = (secp256k1_keypair*)kp->pair;
 	secp256k1_xonly_pubkey pubkey;
 
 	secp256k1_context *ctx =
-		secp256k1_context_create(SECP256K1_CONTEXT_NONE);
+		secp256k1_context_create(SECP256K1_CONTEXT_NONE);;
 
 	/* Try to create a keypair with a valid context, it should only
 	 * fail if the secret key is zero or out of range. */
-	if (!secp256k1_keypair_create(ctx, &key->pair, key->secret))
+	if (!secp256k1_keypair_create(ctx, keypair, kp->secret))
 		return 0;
 
-	if (!secp256k1_keypair_xonly_pub(ctx, &pubkey, NULL, &key->pair))
+	if (!secp256k1_keypair_xonly_pub(ctx, &pubkey, NULL, keypair))
 		return 0;
 
 	/* Serialize the public key. Should always return 1 for a valid public key. */
-	return secp256k1_xonly_pubkey_serialize(ctx, key->pubkey, &pubkey);
+	return secp256k1_xonly_pubkey_serialize(ctx, kp->pubkey, &pubkey);
 }
 
 int ndb_decode_key(const char *secstr, struct ndb_keypair *keypair)
diff --git a/nostrdb.h b/nostrdb.h
@@ -12,7 +12,11 @@ struct ndb_str {
 	};
 };
 
-struct ndb_keypair;
+struct ndb_keypair {
+	unsigned char pubkey[32];
+	unsigned char secret[32];
+	unsigned char pair[96];
+};
 
 // these must be byte-aligned, they are directly accessing the serialized data
 // representation