switch to libsodium aegis256 implementation
This commit is contained in:
4
Makefile
4
Makefile
@@ -18,8 +18,8 @@ FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\"
|
||||
FLAGS += -I.static/$(X)/libsodium-stable/src/libsodium/include
|
||||
FLAGS += -L.static/$(X)/libsodium-stable/src/libsodium/.libs
|
||||
|
||||
SRC := argz/argz.c mud/mud.c mud/aegis256/aegis256.c $(wildcard src/*.c)
|
||||
HDR := argz/argz.h mud/mud.h mud/aegis256/aegis256.h $(wildcard src/*.h)
|
||||
SRC := argz/argz.c mud/mud.c $(wildcard src/*.c)
|
||||
HDR := argz/argz.h mud/mud.h $(wildcard src/*.h)
|
||||
|
||||
$(NAME): $(SRC) $(HDR)
|
||||
$(Q)$(H)$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium
|
||||
|
||||
@@ -7,8 +7,6 @@ glorytun_LDADD = $(libsodium_LIBS)
|
||||
glorytun_SOURCES = \
|
||||
argz/argz.c \
|
||||
argz/argz.h \
|
||||
mud/aegis256/aegis256.c \
|
||||
mud/aegis256/aegis256.h \
|
||||
mud/mud.c \
|
||||
mud/mud.h \
|
||||
src/bench.c \
|
||||
|
||||
@@ -22,7 +22,6 @@ add_global_arguments('-DPACKAGE_NAME="'+meson.project_name()+'"', language : 'c'
|
||||
executable('glorytun', install: true,
|
||||
sources: [
|
||||
'argz/argz.c',
|
||||
'mud/aegis256/aegis256.c',
|
||||
'mud/mud.c',
|
||||
'src/bench.c',
|
||||
'src/bind.c',
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "../argz/argz.h"
|
||||
#include "../mud/aegis256/aegis256.h"
|
||||
|
||||
#define NPUBBYTES 32
|
||||
#define KEYBYTES 32
|
||||
@@ -32,7 +31,7 @@ gt_bench(int argc, char **argv)
|
||||
int aes = argz_is_set(bench_argz, "aes");
|
||||
int chacha = argz_is_set(bench_argz, "chacha");
|
||||
|
||||
if (!aegis256_is_available()) {
|
||||
if (!crypto_aead_aegis256_is_available()) {
|
||||
if (aes) {
|
||||
gt_log("aes is not available on your platform\n");
|
||||
return 1;
|
||||
@@ -72,7 +71,7 @@ gt_bench(int argc, char **argv)
|
||||
crypto_aead_chacha20poly1305_encrypt(
|
||||
buf, NULL, buf, size, NULL, 0, NULL, npub, key);
|
||||
} 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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user