commit 0bd9e27fd2326c66a150a5cce65c2f8ab16b18ce
parent 0041f9888bc1f4fc797f7d9cb749cd161f19d8a3
Author: lash <dev@holbrook.no>
Date: Wed, 26 Mar 2025 03:34:29 +0000
All tests pass
Diffstat:
4 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/src/lq/cert.c b/src/lq/cert.c
@@ -7,9 +7,10 @@
#include "lq/err.h"
#include "lq/store.h"
+static char zeros[65];
static LQPubKey nokey = {
.pk = 0,
- .impl = 0,
+ .impl = zeros,
};
static LQMsg nomsg = {
@@ -20,7 +21,7 @@ static LQMsg nomsg = {
};
static LQSig nosig = {
.pubkey = &nokey,
- .impl = 0,
+ .impl = zeros,
};
LQCert* lq_certificate_new(LQCert *parent, LQCtx *ctx, LQMsg *req, LQMsg *rsp) {
@@ -173,7 +174,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len, LQResolve
// Set request signature if exists
sig = cert->request_sig;
if (cert->request == NULL || sig == NULL) {
- sig = &nosig;
+ sig = &nosig;
}
// \todo proper sig serialize
c = lq_signature_bytes(sig, &sigdata);
@@ -207,7 +208,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len, LQResolve
// Set response signature if exists
sig = cert->response_sig;
if (cert->response == NULL || sig == NULL) {
- sig = &nosig;
+ sig = &nosig;
}
// \todo proper sig serialize
c = lq_signature_bytes(sig, &sigdata);
@@ -244,7 +245,6 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len, LQResolve
return ERR_ENCODING;
}
-
return ERR_OK;
}
diff --git a/src/lq/msg.c b/src/lq/msg.c
@@ -10,9 +10,10 @@
#include "lq/store.h"
#include "endian.h"
+static char zeros[LQ_PUBKEY_LEN];
static LQPubKey nokey = {
.pk = 0,
- .impl = 0,
+ .impl = zeros,
};
LQMsg* lq_msg_new(const char *msg_data, size_t msg_len) {
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -6,12 +6,12 @@ LIBS := ../asn1/defs_asn1_tab.o `pkg-config --libs libtasn1 libgcrypt` -L../aux/
LDFLAGS := -lcheck $(LIBS)
all: build
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_debug_bin
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_config_bin
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_crypto_bin
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_msg_bin
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_cert_bin
-# CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_trust_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_debug_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_config_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_crypto_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_msg_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_cert_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_trust_bin
CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_store_bin
test: all
@@ -22,7 +22,7 @@ build:
# $(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin ../crypto/dummy.o ../mem/std.o $(LDFLAGS)
# $(CC) $(CFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o $(LDFLAGS)
#$(CC) $(CFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
- $(CC) $(CFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o ../lq/trust.o -lhashmap $(LDFLAGS)
+ #$(CC) $(CFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o ../lq/trust.o -lhashmap $(LDFLAGS)
$(CC) $(CFLAGS) test_crypto.c -o test_crypto_bin ../crypto/gcrypt.o ../debug.o ../mem/std.o ../lq/config.o $(LDFLAGS) -lgcrypt
$(CC) $(CFLAGS) test_msg.c -o test_msg_bin ../crypto/gcrypt.o ../debug.o ../mem/std.o ../lq/config.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o $(LDFLAGS)
$(CC) $(CFLAGS) test_cert.c -o test_cert_bin ../crypto/gcrypt.o ../debug.o ../lq/config.o ../mem/std.o ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o ../lq/cert.o $(LDFLAGS)
diff --git a/src/test/test_cert.c b/src/test/test_cert.c
@@ -6,6 +6,7 @@
#include "lq/cert.h"
#include "lq/mem.h"
#include "lq/crypto.h"
+#include "lq/config.h"
const char *data = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
const char *data_two = "Que trata de la condición y ejercicio del famoso hidalgo D. Quijote de la Mancha En un lugar de la Mancha, de cuyo nombre no quiero acordarme, no ha mucho tiempo que vivía un hidalgo de los de lanza en astillero, adarga antigua, rocín flaco y galgo corredor.";
@@ -34,6 +35,7 @@ START_TEST(check_cert_symmetric_nomsg) {
LQCtx ctx;
char buf[4096];
+ lq_config_init();
lq_crypto_init();
lq_set(&ctx, 0, sizeof(LQCtx));
cert = lq_certificate_new(NULL, &ctx, NULL, NULL);
@@ -56,6 +58,8 @@ START_TEST(check_cert_symmetric_req_nosig) {
LQCtx ctx;
char buf[4096];
+ lq_config_init();
+ lq_crypto_init();
lq_set(&ctx, 0, sizeof(LQCtx));
req = lq_msg_new(data, strlen(data) + 1);
cert = lq_certificate_new(NULL, &ctx, req, NULL);
@@ -79,6 +83,7 @@ START_TEST(check_cert_symmetric_req_sig) {
LQCtx ctx;
char buf[4096];
+ lq_config_init();
lq_crypto_init();
pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
@@ -109,6 +114,7 @@ START_TEST(check_cert_symmetric_rsp_onesig) {
LQCtx ctx;
char buf[4096];
+ lq_config_init();
lq_crypto_init();
pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
@@ -140,6 +146,8 @@ START_TEST(check_cert_symmetric_rsp_bothsig) {
LQCtx ctx;
char buf[4096];
+ lq_config_init();
+ lq_crypto_init();
pk = lq_privatekey_new(privkeydata, 32, passphrase, 32);
lq_set(&ctx, 0, sizeof(LQCtx));
req = lq_msg_new(data, strlen(data) + 1);
