commit 437048de92df16339967a5889aa464b3de1a48a3
parent f15680aefe14e3da450be0901cf19e7e0d4b1954
Author: lash <dev@holbrook.no>
Date: Sun, 2 Mar 2025 20:19:50 +0000
Add store interface and resolver
Diffstat:
11 files changed, 133 insertions(+), 38 deletions(-)
diff --git a/src/Makefile b/src/Makefile
@@ -12,6 +12,7 @@ asn1:
dummy:
make -C crypto dummy
make -C mem std
+ make -C store dummy
test: all
make -C test
diff --git a/src/lq/cert.c b/src/lq/cert.c
@@ -5,6 +5,7 @@
#include "lq/mem.h"
#include "lq/wire.h"
#include "lq/err.h"
+#include "lq/store.h"
static LQPubKey nokey = {
.pk = 0,
@@ -118,7 +119,7 @@ int lq_certificate_sign(LQCert *cert, LQPrivKey *pk) {
return ERR_OK;
}
-int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len) {
+int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len, LQResolve *resolve) {
size_t c;
int r;
size_t mx;
@@ -152,7 +153,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len) {
msg = &nomsg;
}
c = mx - LQ_CERT_DOMAIN_LEN;
- r = lq_msg_serialize(msg, buf, &c);
+ r = lq_msg_serialize(msg, buf, &c, resolve);
if (r != ERR_OK) {
return r;
}
@@ -186,7 +187,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len) {
msg = &nomsg;
}
c = mx - LQ_CERT_DOMAIN_LEN;
- r = lq_msg_serialize(msg, buf, &c);
+ r = lq_msg_serialize(msg, buf, &c, resolve);
if (r != ERR_OK) {
return r;
}
@@ -243,7 +244,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len) {
return ERR_OK;
}
-int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len) {
+int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len, LQResolve *resolve) {
int r;
int c;
char err[1024];
@@ -286,7 +287,7 @@ int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len) {
if (r != ASN1_SUCCESS) {
return ERR_READ;
}
- r = lq_msg_deserialize(&p->request, tmp, c);
+ r = lq_msg_deserialize(&p->request, tmp, c, resolve);
if (r != ERR_OK) {
return r;
}
@@ -308,7 +309,7 @@ int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len) {
if (r != ASN1_SUCCESS) {
return ERR_READ;
}
- r = lq_msg_deserialize(&p->response, tmp, c);
+ r = lq_msg_deserialize(&p->response, tmp, c, resolve);
if (r != ERR_OK) {
return r;
}
diff --git a/src/lq/cert.h b/src/lq/cert.h
@@ -6,6 +6,7 @@
#include "lq/crypto.h"
#include "lq/msg.h"
#include "lq/ctx.h"
+#include "lq/store.h"
#ifndef LQ_CERT_DOMAIN_LEN
#define LQ_CERT_DOMAIN_LEN 8
@@ -94,7 +95,7 @@ int lq_certificate_sign(LQCert *cert, LQPrivKey *pk);
* * ERR_WRITE if serialization of an element failed.
* * ERR_ENCODING if generating the final serialization string failed.
*/
-int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len);
+int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len, LQResolve *resolve);
/***
* @brief Deserialize certificate data payload from storage or transport.
@@ -107,7 +108,7 @@ int lq_certificate_serialize(LQCert *cert, char *out, size_t *out_len);
* * ERR_ENCODING if interpretation of the serialized data failed.
* @see lq_certificate_free
*/
-int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len);
+int lq_certificate_deserialize(LQCert **cert, char *in, size_t in_len, LQResolve *resolve);
/***
diff --git a/src/lq/msg.c b/src/lq/msg.c
@@ -7,6 +7,7 @@
#include "lq/err.h"
#include "lq/crypto.h"
#include "lq/wire.h"
+#include "lq/store.h"
#include "endian.h"
static LQPubKey nokey = {
@@ -68,13 +69,15 @@ void lq_msg_free(LQMsg *msg) {
lq_free(msg);
}
-int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len) {
- int c;
+int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len, LQResolve *resolve) {
+ size_t c;
int r;
size_t mx;
+ char tmp[LQ_DIGEST_LEN];
char timedata[8];
char err[1024];
LQPubKey *pubkey;
+ LQResolve *resolve_active;
asn1_node node;
mx = *out_len;
@@ -85,12 +88,26 @@ int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len) {
return ERR_INIT;
}
- c = (int)msg->len;
+ c = LQ_DIGEST_LEN;
*out_len += c;
if (*out_len > mx) {
return ERR_OVERFLOW;
}
- r = asn1_write_value(node, "Qaeda.Msg.data", msg->data, c);
+ r = lq_digest(msg->data, msg->len, tmp);
+ if (r != ERR_OK) {
+ return r;
+ }
+
+ resolve_active = resolve;
+ while (resolve_active != NULL) {
+ r = resolve->store->put(LQ_CONTENT_MSG, tmp, &c, msg->data, msg->len);
+ if (r != ERR_OK) {
+ return r;
+ }
+ resolve_active = resolve_active->next;
+ }
+
+ r = asn1_write_value(node, "Qaeda.Msg.data", tmp, c);
if (r != ASN1_SUCCESS) {
return ERR_WRITE;
}
@@ -139,13 +156,15 @@ int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len) {
return ERR_OK;
}
-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, LQResolve *resolve) {
int r;
- int c;
+ size_t c;
char err[1024];
+ char z[LQ_DIGEST_LEN];
char tmp[1024];
asn1_node node;
asn1_node item;
+ LQResolve *resolve_active;
lq_set(&node, 0, sizeof(node));
lq_set(&item, 0, sizeof(item));
@@ -164,18 +183,26 @@ int lq_msg_deserialize(LQMsg **msg, const char *in, size_t in_len) {
return ERR_ENCODING;
}
- // \todo buffered read
- // \todo avoid double alloc for msg data
- c = 1024;
- r = asn1_read_value(item, "data", tmp, &c);
+ c = LQ_DIGEST_LEN;
+ r = asn1_read_value(item, "data", z, (int*)&c);
if (r != ASN1_SUCCESS) {
return ERR_READ;
}
- *msg = lq_msg_new((const char*)tmp, (size_t)c);
+ c = 1024;
+ resolve_active = resolve;
+ while (resolve_active != NULL) {
+ r = resolve->store->get(LQ_CONTENT_MSG, z, LQ_DIGEST_LEN, tmp, &c);
+ if (r != ERR_OK) {
+ return r;
+ }
+ resolve_active = resolve_active->next;
+ }
+
+ *msg = lq_msg_new((const char*)tmp, c);
/// \todo document timestamp size
c = 8;
- r = asn1_read_value(item, "timestamp", tmp, &c);
+ r = asn1_read_value(item, "timestamp", tmp, (int*)&c);
if (r != ASN1_SUCCESS) {
return ERR_READ;
}
@@ -187,7 +214,7 @@ int lq_msg_deserialize(LQMsg **msg, const char *in, size_t in_len) {
lq_cpy(&((*msg)->time.tv_nsec), ((char*)tmp)+4, 4);
c = 65;
- r = asn1_read_value(item, "pubkey", tmp, &c);
+ r = asn1_read_value(item, "pubkey", tmp, (int*)&c);
if (r != ASN1_SUCCESS) {
return ERR_READ;
}
diff --git a/src/lq/msg.h b/src/lq/msg.h
@@ -5,6 +5,7 @@
#include <time.h>
#include "lq/crypto.h"
+#include "lq/store.h"
/***
* @struct LQMsg
@@ -68,7 +69,7 @@ LQSig* lq_msg_sign_extra(LQMsg *msg, LQPrivKey *pk, const char *salt, const char
* * ERR_WRITE if serialization of an element failed.
* * ERR_ENCODING if generating the final serialization string failed.
*/
-int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len);
+int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len, LQResolve *resolve);
/***
* @brief Deserialize message data payload from certificate.
@@ -81,7 +82,7 @@ int lq_msg_serialize(LQMsg *msg, char *out, size_t *out_len);
* * ERR_ENCODING if interpretation of the serialized data failed.
* @see lq_msg_free
*/
-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, LQResolve *resolve);
/***
* @brief Free an instantiated message.
diff --git a/src/lq/store.h b/src/lq/store.h
@@ -0,0 +1,25 @@
+#ifndef LIBQAEDA_STORE_H_
+#define LIBQAEDA_STORE_H_
+
+#include <stddef.h>
+
+enum payload_e {
+ LQ_CONTENT_RAW,
+ LQ_CONTENT_MSG,
+ LQ_CONTENT_CERT,
+ LQ_CONTENT_KEY,
+};
+
+struct lq_store_t {
+ int (*get)(enum payload_e typ, const char *key, size_t key_len, char *value, size_t *value_len);
+ int (*put)(enum payload_e typ, const char *key, size_t *key_len, char *value, size_t value_len);
+};
+
+
+typedef struct lq_resolve_t LQResolve;
+struct lq_resolve_t {
+ struct lq_store_t *store;
+ LQResolve *next;
+};
+
+#endif // LIBQAEDA_STORE_H_
diff --git a/src/store/Makefile b/src/store/Makefile
@@ -0,0 +1,10 @@
+INCLUDES := -I.. -I../aux/include
+CFLAGS += $(INCLUDES) -Wall
+
+dummy:
+ $(CC) $(CFLAGS) -g3 -c dummy.c
+
+clean:
+ rm -vf *.o
+
+.PHONY: clean
diff --git a/src/store/dummy.c b/src/store/dummy.c
@@ -0,0 +1,24 @@
+#include <stddef.h>
+#include <stdio.h>
+
+#include "lq/store.h"
+#include "hex.h"
+
+static char buf[4096];
+
+int lq_dummy_content_get(enum payload_e typ, const char *key, size_t key_len, char *value, size_t *value_len) {
+ b2h((const unsigned char*)key, (int)key_len, (unsigned char*)buf);
+ fprintf(stderr, "pretend get %d: %s\n", typ, buf);
+ return 0;
+}
+
+int lq_dummy_content_put(enum payload_e typ, const char *key, size_t *key_len, char *value, size_t value_len) {
+ b2h((const unsigned char*)key, (int)*key_len, (unsigned char*)buf);
+ fprintf(stderr, "pretend put %d: %s -> %s\n", typ, buf, value);
+ return 0;
+}
+
+struct lq_store_t LQDummyContent = {
+ .get = lq_dummy_content_get,
+ .put = lq_dummy_content_put,
+};
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -1,5 +1,5 @@
OBJS := $(patsubst %.c,%.o,$(wildcard *.c))
-INCLUDES := -I..
+INCLUDES := -I.. -I../aux/include
CFLAGS += $(INCLUDES) -Wall -g3
LIBS := `pkg-config --libs libtasn1` -L../aux/lib -llash ../asn1/defs_asn1_tab.o
LDFLAGS += $(LIBS)
@@ -13,8 +13,8 @@ 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
- $(CC) $(CFLAGS) $(LDFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../lq/msg.o ../lq/cert.o -lcheck
+ $(CC) $(CFLAGS) $(LDFLAGS) test_msg.c -o test_msg_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../lq/msg.o -lcheck
+ $(CC) $(CFLAGS) $(LDFLAGS) test_cert.c -o test_cert_bin ../crypto/dummy.o ../mem/std.o ../store/dummy.o ../lq/msg.o ../lq/cert.o -lcheck
clean:
rm -vf test_*_bin
diff --git a/src/test/test_cert.c b/src/test/test_cert.c
@@ -21,11 +21,11 @@ START_TEST(check_cert_symmetric_nomsg) {
lq_set(&ctx, 0, sizeof(LQCtx));
cert = lq_certificate_new(NULL, &ctx, NULL, NULL);
c = 4096;
- r = lq_certificate_serialize(cert, buf, &c);
+ r = lq_certificate_serialize(cert, buf, &c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
- r = lq_certificate_deserialize(&cert, buf, c);
+ r = lq_certificate_deserialize(&cert, buf, c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
}
@@ -43,11 +43,11 @@ START_TEST(check_cert_symmetric_req_nosig) {
req = lq_msg_new(data, strlen(data) + 1);
cert = lq_certificate_new(NULL, &ctx, req, NULL);
c = 4096;
- r = lq_certificate_serialize(cert, buf, &c);
+ r = lq_certificate_serialize(cert, buf, &c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
- r = lq_certificate_deserialize(&cert, buf, c);
+ r = lq_certificate_deserialize(&cert, buf, c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
}
@@ -71,11 +71,11 @@ START_TEST(check_cert_symmetric_req_sig) {
ck_assert_int_eq(r, 0);
c = 4096;
- r = lq_certificate_serialize(cert, buf, &c);
+ r = lq_certificate_serialize(cert, buf, &c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
- r = lq_certificate_deserialize(&cert, buf, c);
+ r = lq_certificate_deserialize(&cert, buf, c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
}
@@ -101,11 +101,11 @@ START_TEST(check_cert_symmetric_rsp_onesig) {
cert->response = rsp;
c = 4096;
- r = lq_certificate_serialize(cert, buf, &c);
+ r = lq_certificate_serialize(cert, buf, &c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
- r = lq_certificate_deserialize(&cert, buf, c);
+ r = lq_certificate_deserialize(&cert, buf, c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
}
@@ -132,11 +132,11 @@ START_TEST(check_cert_symmetric_rsp_bothsig) {
ck_assert_int_eq(r, 0);
c = 4096;
- r = lq_certificate_serialize(cert, buf, &c);
+ r = lq_certificate_serialize(cert, buf, &c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
- r = lq_certificate_deserialize(&cert, buf, c);
+ r = lq_certificate_deserialize(&cert, buf, c, NULL);
ck_assert_int_eq(r, 0);
lq_certificate_free(cert);
}
diff --git a/src/test/test_msg.c b/src/test/test_msg.c
@@ -5,6 +5,8 @@
#include "lq/msg.h"
#include "lq/crypto.h"
+extern struct lq_store_t LQDummyContent;
+
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) {
@@ -12,16 +14,19 @@ START_TEST(check_msg_symmetric) {
size_t c;
char buf[4096];
LQMsg *msg;
+ LQResolve resolve;
+ resolve.store = &LQDummyContent;
+ resolve.next = NULL;
msg = lq_msg_new(data, strlen(data) + 1);
msg->pubkey = lq_publickey_new(data);
c = 4096;
- r = lq_msg_serialize(msg, buf, &c);
+ r = lq_msg_serialize(msg, buf, &c, &resolve);
ck_assert_int_eq(r, 0);
lq_msg_free(msg);
- r = lq_msg_deserialize(&msg, buf, c);
+ r = lq_msg_deserialize(&msg, buf, c, &resolve);
ck_assert_ptr_nonnull(msg);
ck_assert_int_eq(r, 0);
lq_msg_free(msg);
