miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

switch to libsodium aegis256 implementation

Browse Source
This commit is contained in:
Josef Miegl
2020-06-09 21:13:21 +02:00
parent 47d8790409
commit 8a72f6eec0
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -18,8 +18,8 @@ FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\"
FLAGS += -I.static/$(X)/libsodium-stable/src/libsodium/include FLAGS += -I.static/$(X)/libsodium-stable/src/libsodium/include
FLAGS += -L.static/$(X)/libsodium-stable/src/libsodium/.libs FLAGS += -L.static/$(X)/libsodium-stable/src/libsodium/.libs
SRC := argz/argz.c mud/mud.c mud/aegis256/aegis256.c $(wildcard src/*.c) SRC := argz/argz.c mud/mud.c $(wildcard src/*.c)
HDR := argz/argz.h mud/mud.h mud/aegis256/aegis256.h $(wildcard src/*.h) HDR := argz/argz.h mud/mud.h $(wildcard src/*.h)
$(NAME): $(SRC) $(HDR) $(NAME): $(SRC) $(HDR)
$(Q)$(H)$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium $(Q)$(H)$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium

2
Makefile.am
View File

@@ -7,8 +7,6 @@ glorytun_LDADD = $(libsodium_LIBS)
glorytun_SOURCES = \ glorytun_SOURCES = \
argz/argz.c \ argz/argz.c \
argz/argz.h \ argz/argz.h \
mud/aegis256/aegis256.c \
mud/aegis256/aegis256.h \
mud/mud.c \ mud/mud.c \
mud/mud.h \ mud/mud.h \
src/bench.c \ src/bench.c \

1
meson.build
View File

@@ -22,7 +22,6 @@ add_global_arguments('-DPACKAGE_NAME="'+meson.project_name()+'"', language : 'c'
executable('glorytun', install: true, executable('glorytun', install: true,
sources: [ sources: [
'argz/argz.c', 'argz/argz.c',
'mud/aegis256/aegis256.c',
'mud/mud.c', 'mud/mud.c',
'src/bench.c', 'src/bench.c',
'src/bind.c', 'src/bind.c',

5
src/bench.c
View File

@@ -7,7 +7,6 @@
#include <time.h> #include <time.h>
#include "../argz/argz.h" #include "../argz/argz.h"
#include "../mud/aegis256/aegis256.h"
#define NPUBBYTES 32 #define NPUBBYTES 32
#define KEYBYTES 32 #define KEYBYTES 32
@@ -32,7 +31,7 @@ gt_bench(int argc, char **argv)
int aes = argz_is_set(bench_argz, "aes"); int aes = argz_is_set(bench_argz, "aes");
int chacha = argz_is_set(bench_argz, "chacha"); int chacha = argz_is_set(bench_argz, "chacha");
if (!aegis256_is_available()) { if (!crypto_aead_aegis256_is_available()) {
if (aes) { if (aes) {
gt_log("aes is not available on your platform\n"); gt_log("aes is not available on your platform\n");
return 1; return 1;
@@ -72,7 +71,7 @@ gt_bench(int argc, char **argv)
crypto_aead_chacha20poly1305_encrypt( crypto_aead_chacha20poly1305_encrypt(
buf, NULL, buf, size, NULL, 0, NULL, npub, key); buf, NULL, buf, size, NULL, 0, NULL, npub, key);
} else { } else {
aegis256_encrypt(buf, NULL, buf, size, NULL, 0, npub, key); crypto_aead_aegis256_encrypt(buf, NULL, buf, size, NULL, 0, NULL, npub, key);
} }
bytes += size; bytes += size;
} }