nostr/nostril
1
0
Fork 0
mirror of https://github.com/jb55/nostril.git synced 2024-11-21 16:29:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

embed libsecp256k1 build

Browse Source 
don't rely on external deps

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin 2022-08-08 15:31:38 -07:00
parent 098f639f46
commit e8fd862590
4 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "deps/secp256k1"]
path = deps/secp256k1
url = https://github.com/bitcoin-core/secp256k1

36
Makefile
View File

@ -1,17 +1,40 @@
CFLAGS = -Wall -Og CFLAGS = -Wall -Og -Ideps/secp256k1/include
OBJS = sha256.o nostril.o aes.o base64.o OBJS = sha256.o nostril.o aes.o base64.o
HEADERS = hex.h random.h config.h sha256.h HEADERS = hex.h random.h config.h sha256.h deps/secp256k1/include/secp256k1.h
PREFIX ?= /usr/local PREFIX ?= /usr/local
ARS = libsecp256k1.a
SUBMODULES = deps/secp256k1
all: nostril all: nostril
%.o: %.c config.h deps/secp256k1/.git:
@devtools/refresh-submodules.sh $(SUBMODULES)
deps/secp256k1/include/secp256k1.h: deps/secp256k1/.git
deps/secp256k1/configure: deps/secp256k1/.git
cd deps/secp256k1; \
./autogen.sh
deps/secp256k1/config.log: deps/secp256k1/configure
cd deps/secp256k1; \
./configure --disable-shared --enable-module-ecdh --enable-module-schnorrsig --enable-module-extrakeys
deps/secp256k1/.libs/libsecp256k1.a: deps/secp256k1/config.log
cd deps/secp256k1; \
make -j libsecp256k1.la
libsecp256k1.a: deps/secp256k1/.libs/libsecp256k1.a
cp $< $@
%.o: %.c $(HEADERS)
@echo "cc $<" @echo "cc $<"
@$(CC) $(CFLAGS) -c $< -o $@ @$(CC) $(CFLAGS) -c $< -o $@
nostril: $(HEADERS) $(OBJS) nostril: $(HEADERS) $(OBJS) $(ARS)
$(CC) $(CFLAGS) $(OBJS) -lsecp256k1 -o $@ $(CC) $(CFLAGS) $(OBJS) $(ARS) -o $@
install: nostril install: nostril
mkdir -p $(PREFIX)/bin mkdir -p $(PREFIX)/bin
@ -24,7 +47,8 @@ configurator: configurator.c
$(CC) $< -o $@ $(CC) $< -o $@
clean: clean:
rm -f nostril *.o rm -f nostril *.o *.a
rm -rf deps/secp256k1
tags: fake tags: fake
ctags *.c *.h ctags *.c *.h

1
deps/secp256k1 vendored Submodule

@ -0,0 +1 @@
Subproject commit 694ce8fb2d1fd8a3d641d7c33705691d41a2a860

9
nostril.c
View File

@ -6,9 +6,9 @@
#include <errno.h> #include <errno.h>
#include <inttypes.h> #include <inttypes.h>
#include <secp256k1.h> #include "secp256k1.h"
#include <secp256k1_ecdh.h> #include "secp256k1_ecdh.h"
#include <secp256k1_schnorrsig.h> #include "secp256k1_schnorrsig.h"
#include "cursor.h" #include "cursor.h"
#include "hex.h" #include "hex.h"
@ -209,7 +209,7 @@ static int make_sig(secp256k1_context *ctx, struct key *key,
return 0; return 0;
} }
return secp256k1_schnorrsig_sign(ctx, sig, id, &key->pair, aux); return secp256k1_schnorrsig_sign32(ctx, sig, id, &key->pair, aux);
} }
static int create_key(secp256k1_context *ctx, struct key *key) static int create_key(secp256k1_context *ctx, struct key *key)
@ -603,7 +603,6 @@ static int make_encrypted_dm(secp256k1_context *ctx, struct key *key,
if (enclen == 0) { if (enclen == 0) {
fprintf(stderr, "make_encrypted_dm: aes_encrypt failed\n"); fprintf(stderr, "make_encrypted_dm: aes_encrypt failed\n");
free(buf); free(buf);
free(encbuf);
return 0; return 0;
} }