From c87ac314e44366fd20667dde24cbc2699c2e0845 Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Wed, 2 Feb 2022 07:14:37 +0100 Subject: tests fixed --- ecp/src/ecp/crypto/test/Makefile | 7 ++++--- ecp/src/ecp/crypto/test/aead.c | 18 +++++++++--------- ecp/src/ecp/crypto/test/aead_dec.c | 20 +++++--------------- ecp/src/ecp/crypto/test/aead_enc.c | 16 ++++++++-------- ecp/src/ecp/crypto/test/ed25519.c | 16 +++------------- ecp/src/ecp/crypto/test/ed25519_open.c | 14 ++------------ ecp/src/ecp/crypto/test/ed25519_sign.c | 16 +++------------- 7 files changed, 34 insertions(+), 73 deletions(-) (limited to 'ecp') diff --git a/ecp/src/ecp/crypto/test/Makefile b/ecp/src/ecp/crypto/test/Makefile index 0b5013f..f5e955b 100644 --- a/ecp/src/ecp/crypto/test/Makefile +++ b/ecp/src/ecp/crypto/test/Makefile @@ -1,7 +1,8 @@ -include ../../Makefile.platform -CFLAGS += -I.. -I../include +include ../../common.mk +ssl_dir = ../../../../../ext/libressl +CFLAGS += -I.. -I$(ssl_dir)/include -dep=../e_chacha20poly1305.o ../curve25519/*.o ../chacha/*.o ../poly1305/*.o ../sha/*.o ../compat/*.o +dep=../libecpcr.a %.o: %.c diff --git a/ecp/src/ecp/crypto/test/aead.c b/ecp/src/ecp/crypto/test/aead.c index a2e0da7..6ba0267 100644 --- a/ecp/src/ecp/crypto/test/aead.c +++ b/ecp/src/ecp/crypto/test/aead.c @@ -5,15 +5,15 @@ #include #include -#include +#include -#define NONCE_LEN 8 +#define NONCE_LEN 12 #define TAG_LEN 16 #define KEY_LEN 32 static int v_rng(void *buf, size_t bufsize) { int fd; - + if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; size_t nb = read(fd, buf, bufsize); close(fd); @@ -39,17 +39,17 @@ int main(int argc, char *argv[]) { in_msg_len = strlen((char *)in_msg) + 1; v_rng(nonce, NONCE_LEN); - X25519_keypair(public1, private1, v_rng); - X25519_keypair(public2, private2, v_rng); - + X25519_keypair(public1, private1); + X25519_keypair(public2, private2); + X25519(key1, private1, public2); - rv = aead_chacha20_poly1305_seal(out_msg, &out_msg_len, 1024, key1, TAG_LEN, nonce, NONCE_LEN, in_msg, in_msg_len, NULL, 0); + rv = aead_chacha20_poly1305_seal(key1, TAG_LEN, out_msg, &out_msg_len, 1024, nonce, NONCE_LEN, in_msg, in_msg_len, NULL, 0); printf("SEAL RV:%d ILEN:%lu OLEN:%lu\n", rv, in_msg_len, out_msg_len); memset(in_msg, 0, sizeof(in_msg)); X25519(key2, private2, public1); - rv = aead_chacha20_poly1305_open(in_msg, &in_msg_len, 1024, key2, TAG_LEN, nonce, NONCE_LEN, out_msg, out_msg_len, NULL, 0); - printf("OPEN RV:%d ILEN:%lu OLEN:%lu\n", rv, in_msg_len, out_msg_len); + rv = aead_chacha20_poly1305_open(key2, TAG_LEN, in_msg, &in_msg_len, 1024, nonce, NONCE_LEN, out_msg, out_msg_len, NULL, 0); + printf("OPEN RV:%d ILEN:%lu OLEN:%lu\n", rv, out_msg_len, in_msg_len); printf("MSG: %s\n", in_msg); } \ No newline at end of file diff --git a/ecp/src/ecp/crypto/test/aead_dec.c b/ecp/src/ecp/crypto/test/aead_dec.c index 7deb587..6efb677 100644 --- a/ecp/src/ecp/crypto/test/aead_dec.c +++ b/ecp/src/ecp/crypto/test/aead_dec.c @@ -5,23 +5,13 @@ #include #include -#include +#include -#define NONCE_LEN 8 +#define NONCE_LEN 12 #define TAG_LEN 16 #define KEY_LEN 32 #define MSG_LEN 29 -static int v_rng(void *buf, size_t bufsize) { - int fd; - - if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; - size_t nb = read(fd, buf, bufsize); - close(fd); - if (nb != bufsize) return -1; - return 0; -} - int main(int argc, char *argv[]) { unsigned char in_msg[1024]; unsigned char out_msg[1024]; @@ -38,9 +28,9 @@ int main(int argc, char *argv[]) { read(fd, nonce, NONCE_LEN); read(fd, out_msg, MSG_LEN); close(fd); - + X25519(key, private, public); - rv = aead_chacha20_poly1305_open(in_msg, &in_msg_len, 1024, key, TAG_LEN, nonce, NONCE_LEN, out_msg, MSG_LEN, NULL, 0); - printf("OPEN RV:%d ILEN:%lu OLEN:%d\n", rv, in_msg_len, MSG_LEN); + rv = aead_chacha20_poly1305_open(key, TAG_LEN, in_msg, &in_msg_len, 1024, nonce, NONCE_LEN, out_msg, MSG_LEN, NULL, 0); + printf("OPEN RV:%d ILEN:%d OLEN:%lu\n", rv, MSG_LEN, in_msg_len); printf("MSG: %s\n", in_msg); } \ No newline at end of file diff --git a/ecp/src/ecp/crypto/test/aead_enc.c b/ecp/src/ecp/crypto/test/aead_enc.c index a103490..cab2ff5 100644 --- a/ecp/src/ecp/crypto/test/aead_enc.c +++ b/ecp/src/ecp/crypto/test/aead_enc.c @@ -5,15 +5,15 @@ #include #include -#include +#include -#define NONCE_LEN 8 +#define NONCE_LEN 12 #define TAG_LEN 16 #define KEY_LEN 32 static int v_rng(void *buf, size_t bufsize) { int fd; - + if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; size_t nb = read(fd, buf, bufsize); close(fd); @@ -38,13 +38,13 @@ int main(int argc, char *argv[]) { in_msg_len = strlen((char *)in_msg) + 1; v_rng(nonce, NONCE_LEN); - X25519_keypair(public1, private1, v_rng); - X25519_keypair(public2, private2, v_rng); - + X25519_keypair(public1, private1); + X25519_keypair(public2, private2); + X25519(key, private1, public2); - rv = aead_chacha20_poly1305_seal(out_msg, &out_msg_len, 1024, key, TAG_LEN, nonce, NONCE_LEN, in_msg, in_msg_len, NULL, 0); + rv = aead_chacha20_poly1305_seal(key, TAG_LEN, out_msg, &out_msg_len, 1024, nonce, NONCE_LEN, in_msg, in_msg_len, NULL, 0); printf("SEAL RV:%d ILEN:%lu OLEN:%lu\n", rv, in_msg_len, out_msg_len); - + unlink("msg.enc"); int fd = open("msg.enc", O_WRONLY | O_CREAT); write(fd, private2, KEY_LEN); diff --git a/ecp/src/ecp/crypto/test/ed25519.c b/ecp/src/ecp/crypto/test/ed25519.c index 21334cb..5f70792 100644 --- a/ecp/src/ecp/crypto/test/ed25519.c +++ b/ecp/src/ecp/crypto/test/ed25519.c @@ -4,21 +4,11 @@ #include #include -#include +#include #define KEY_LEN 32 #define SIG_LEN 64 -static int v_rng(void *buf, size_t bufsize) { - int fd; - - if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; - size_t nb = read(fd, buf, bufsize); - close(fd); - if (nb != bufsize) return -1; - return 0; -} - int main(int argc, char *argv[]) { unsigned char msg[1024]; size_t msg_len; @@ -29,8 +19,8 @@ int main(int argc, char *argv[]) { strcpy((char *)msg, "PERA JE CAR!"); msg_len = strlen((char *)msg) + 1; - - ED25519_keypair(public, private, v_rng); + + ED25519_keypair(public, private); ED25519_sign(signature, msg, msg_len, private); rv = ED25519_verify(msg, msg_len, signature, public); printf("OPEN rv:%d\n", rv); diff --git a/ecp/src/ecp/crypto/test/ed25519_open.c b/ecp/src/ecp/crypto/test/ed25519_open.c index 66f32f5..b63aac4 100644 --- a/ecp/src/ecp/crypto/test/ed25519_open.c +++ b/ecp/src/ecp/crypto/test/ed25519_open.c @@ -4,21 +4,11 @@ #include #include -#include +#include #define KEY_LEN 32 #define SIG_LEN 64 -static int v_rng(void *buf, size_t bufsize) { - int fd; - - if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; - size_t nb = read(fd, buf, bufsize); - close(fd); - if (nb != bufsize) return -1; - return 0; -} - int main(int argc, char *argv[]) { unsigned char msg[1024]; size_t msg_len; @@ -29,7 +19,7 @@ int main(int argc, char *argv[]) { strcpy((char *)msg, "PERA JE CAR!"); msg_len = strlen((char *)msg) + 1; - + int fd = open("msg.sig", O_RDONLY); read(fd, public, KEY_LEN); read(fd, signature, SIG_LEN); diff --git a/ecp/src/ecp/crypto/test/ed25519_sign.c b/ecp/src/ecp/crypto/test/ed25519_sign.c index da098bd..34c197f 100644 --- a/ecp/src/ecp/crypto/test/ed25519_sign.c +++ b/ecp/src/ecp/crypto/test/ed25519_sign.c @@ -4,21 +4,11 @@ #include #include -#include +#include #define KEY_LEN 32 #define SIG_LEN 64 -static int v_rng(void *buf, size_t bufsize) { - int fd; - - if((fd = open("/dev/urandom", O_RDONLY)) < 0) return -1; - size_t nb = read(fd, buf, bufsize); - close(fd); - if (nb != bufsize) return -1; - return 0; -} - int main(int argc, char *argv[]) { unsigned char msg[1024]; size_t msg_len; @@ -28,8 +18,8 @@ int main(int argc, char *argv[]) { strcpy((char *)msg, "PERA JE CAR!"); msg_len = strlen((char *)msg) + 1; - - ED25519_keypair(public, private, v_rng); + + ED25519_keypair(public, private); ED25519_sign(signature, msg, msg_len, private); unlink("msg.sig"); -- cgit v1.2.3