commit 5d2fc329673aa210bba716fa583fd6e7ecfcd6cb
parent 10e2a18fb7cadfd5791f65cbe988bb60cf8ed0e9
Author: lash <dev@holbrook.no>
Date: Sun, 2 Mar 2025 11:40:35 +0000
Add msg test, serialization
Diffstat:
8 files changed, 185 insertions(+), 15 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -1,4 +1,6 @@
-all: asn1 dummy
+all: asn1 core dummy
+
+core:
make -C lq
asn1:
@@ -7,5 +9,5 @@ dummy:
make -C crypto dummy
make -C mem std
-test: dummy
+test: core dummy
make -C test
diff --git a/src/crypto/dummy.c b/src/crypto/dummy.c
@@ -47,7 +47,7 @@ LQPubKey* lq_publickey_new(const char *full) {
LQPubKey *pubk;
pubk = lq_alloc(sizeof(LQPubKey));
- lq_set(pubk->pk, 0, sizeof(LQPrivKey*));
+ pubk->pk = 0;
pubk->lokey = lq_alloc(65);
lq_cpy(pubk->lokey, full, 65);
pubk->lolen = 65;
diff --git a/src/lq/Makefile b/src/lq/Makefile
@@ -1,6 +1,9 @@
OBJS := $(patsubst %.c,%.o,$(filter-out main.c,$(wildcard *.c)))
INCLUDES := -I.. -I../aux/include
CFLAGS += $(INCLUDES) -Wall
+LIBS := `pkg-config --libs libtasn1` -L../aux/lib -llash ../asn1/defs_asn1_tab.o
+
+LDFLAGS += $(LIBS)
%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(LDFLAGS)
diff --git a/src/lq/err.h b/src/lq/err.h
@@ -0,0 +1,17 @@
+#ifndef LIBQAEDA_ERR_H_
+#define LIBQAEDA_ERR_H_
+
+enum err_e {
+ ERR_OK,
+ ERR_BYTEORDER,
+ ERR_OVERFLOW,
+ ERR_INIT,
+ ERR_READ,
+ ERR_WRITE,
+ ERR_ENCODING,
+};
+
+typedef enum err_e LQErr;
+
+#endif // LIBQAEDA_ERR_H_
+
diff --git a/src/lq/msg.c b/src/lq/msg.c
@@ -6,6 +6,7 @@
#include "lq/mem.h"
#include "lq/crypto.h"
#include "lq/wire.h"
+#include "lq/err.h"
#include "endian.h"
@@ -16,6 +17,10 @@ LQMsg* lq_msg_new(const char *msg_data, size_t msg_len) {
lq_set(msg, 0, sizeof(LQMsg));
clock_gettime(CLOCK_REALTIME, &msg->time);
+ msg->data = lq_alloc(msg_len);
+ lq_cpy(msg->data, msg_data, msg_len);
+ msg->len = msg_len;
+
return msg;
}
@@ -41,52 +46,126 @@ void lq_msg_free(LQMsg *msg) {
if (msg->pubkey != 0) {
lq_free(msg->pubkey);
}
+ lq_free(msg->data);
lq_free(msg);
}
int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len) {
int c;
int r;
+ size_t mx;
char timedata[8];
char err[1024];
asn1_node node;
+ mx = *out_len;
+ *out_len = 0;
+ lq_set(&node, 0, sizeof(node));
r = asn1_array2tree(defs_asn1_tab, &node, err);
if (r != ASN1_SUCCESS) {
- return 1;
+ return ERR_INIT;
}
c = (int)msg->len;
+ *out_len += c;
+ if (*out_len > mx) {
+ return ERR_OVERFLOW;
+ }
r = asn1_write_value(node, "Qaeda.Msg.data", msg->data, c);
if (r != ASN1_SUCCESS) {
- return 1;
+ return ERR_WRITE;
}
lq_cpy(timedata, &msg->time.tv_sec, 4);
lq_cpy(((char*)timedata)+4, &msg->time.tv_nsec, 4);
r = to_endian(TO_ENDIAN_BIG, 4, timedata);
if (r) {
- return 1;
+ return ERR_BYTEORDER;
}
r = to_endian(TO_ENDIAN_BIG, 4, ((char*)timedata)+4);
if (r) {
- return 1;
+ return ERR_BYTEORDER;
}
c = sizeof(int);
+ *out_len += c;
+ if (*out_len > mx) {
+ return ERR_OVERFLOW;
+ }
r = asn1_write_value(node, "Qaeda.Msg.timestamp", &timedata, c);
if (r != ASN1_SUCCESS) {
- return 1;
+ return ERR_WRITE;
}
c = msg->pubkey->lolen;
+ *out_len += c;
+ if (*out_len > mx) {
+ return ERR_OVERFLOW;
+ }
r = asn1_write_value(node, "Qaeda.Msg.pubkey", &msg->pubkey->lokey, c);
if (r != ASN1_SUCCESS) {
- return 1;
+ return ERR_WRITE;
}
+ *out_len = mx;
r = asn1_der_coding(node, "Qaeda.Msg", out, (int*)out_len, err);
if (r != ASN1_SUCCESS) {
+ return ERR_ENCODING;
+ }
+
+ return 0;
+}
+
+int lq_msg_deserialize(LQMsg **msg, const char *in, size_t in_len) {
+ int r;
+ int c;
+ char err[1024];
+ char tmp[1024];
+ asn1_node node;
+ asn1_node item;
+
+ lq_set(&node, 0, sizeof(node));
+ lq_set(&item, 0, sizeof(node));
+ r = asn1_array2tree(defs_asn1_tab, &node, err);
+ if (r != ASN1_SUCCESS) {
+ return 3;
+ }
+
+ r = asn1_create_element(node, "Qaeda.Msg", &item);
+ if (r != ASN1_SUCCESS) {
+ return 1;
+ }
+
+ r = asn1_der_decoding(&item, in, in_len, err);
+ if (r != ASN1_SUCCESS) {
+ return 1;
+ }
+
+ // \todo buffered read
+ // \todo avoid double alloc for msg data
+ c = 1024;
+ r = asn1_read_value(item, "data", tmp, &c);
+ if (r != ASN1_SUCCESS) {
+ return 1;
+ }
+ *msg = lq_msg_new((const char*)tmp, (size_t)c);
+
+ /// \todo document timestamp size
+ c = 8;
+ r = asn1_read_value(item, "timestamp", tmp, &c);
+ if (r != ASN1_SUCCESS) {
+ return 1;
+ }
+ if (is_le()) {
+ flip_endian(4, (char*)tmp);
+ flip_endian(4, ((char*)tmp)+4);
+ }
+ lq_cpy(&((*msg)->time.tv_sec), tmp, 4);
+ lq_cpy(&((*msg)->time.tv_nsec), ((char*)tmp)+4, 4);
+
+ c = 65;
+ r = asn1_read_value(item, "pubkey", tmp, &c);
+ if (r != ASN1_SUCCESS) {
return 1;
}
diff --git a/src/lq/msg.h b/src/lq/msg.h
@@ -11,7 +11,7 @@
#endif
struct lq_msg_t {
- const char *data;
+ char *data;
size_t len;
struct timespec time;
LQPubKey *pubkey;
@@ -22,6 +22,6 @@ LQMsg* lq_msg_new(const char *msg_data, size_t msg_len);
int lq_msg_sign(LQMsg *msg, LQPrivKey *pk);
int lq_msg_sign_salted(LQMsg *msg, LQPrivKey *pk, const char *salt, size_t salt_len);
int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len);
-int lq_msg_deserialize(LQMsg *msg, const char *in, size_t in_len);
+int lq_msg_deserialize(LQMsg **msg, const char *in, size_t in_len);
void lq_msg_free(LQMsg *msg);
#endif // LIBQAEDA_MSG_H_
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -1,9 +1,21 @@
OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
INCLUDES := -I..
CFLAGS += $(INCLUDES) -Wall -g3
+LIBS := `pkg-config --libs libtasn1` -L../aux/lib -llash ../asn1/defs_asn1_tab.o
+LDFLAGS += $(LIBS)
-%.o: %.c
- $(CC) $(CFLAGS) $< -o $*_bin $(LDFLAGS) ../crypto/dummy.o ../mem/std.o -lcheck
- ./$*_bin
+#%.o: %.c
+# $(CC) $(CFLAGS) $< -o $*_bin $(LDFLAGS) ../crypto/dummy.o ../mem/std.o -lcheck
+# ./$*_bin
+
+#all: $(OBJS)
+all: build
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_crypto_bin
+ CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_msg_bin
+
+test: all
+
+build:
+ $(CC) $(CFLAGS) $(LDFLAGS) test_crypto.c -o test_crypto_bin ../crypto/dummy.o ../mem/std.o -lcheck
+ $(CC) $(CFLAGS) $(LDFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../lq/msg.o -lcheck
-all: $(OBJS)
diff --git a/src/test/test_msg.c b/src/test/test_msg.c
@@ -0,0 +1,57 @@
+#include <check.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "lq/msg.h"
+#include "lq/crypto.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.";
+
+START_TEST(check_msg_symmetric) {
+ int r;
+ size_t c;
+ char buf[4096];
+ LQMsg *msg;
+
+ msg = lq_msg_new(data, strlen(data) + 1);
+ msg->pubkey = lq_publickey_new(data);
+
+ c = 4096;
+ r = lq_msg_serialize(msg, buf, &c);
+ ck_assert_int_eq(r, 0);
+ lq_msg_free(msg);
+
+ r = lq_msg_deserialize(&msg, buf, c);
+ ck_assert_ptr_nonnull(msg);
+ ck_assert_int_eq(r, 0);
+ lq_msg_free(msg);
+}
+END_TEST
+
+Suite * common_suite(void) {
+ Suite *s;
+ TCase *tc;
+
+ s = suite_create("msg");
+ tc = tcase_create("serialize");
+ tcase_add_test(tc, check_msg_symmetric);
+ suite_add_tcase(s, tc);
+
+ return s;
+}
+
+int main(void) {
+ int n_fail;
+
+ Suite *s;
+ SRunner *sr;
+
+ s = common_suite();
+ sr = srunner_create(s);
+
+ srunner_run_all(sr, CK_VERBOSE);
+ n_fail = srunner_ntests_failed(sr);
+ srunner_free(sr);
+
+ return (n_fail == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+}
