commit f45c36dede6c9add976bc98ed1c0ce333850fbc1
parent b831c3fcf661a1ff09676f380ab834837641b6de
Author: lash <dev@holbrook.no>
Date: Mon, 3 Mar 2025 02:19:41 +0000
Pass first trust test
Diffstat:
3 files changed, 104 insertions(+), 20 deletions(-)
diff --git a/src/store/mem.c b/src/store/mem.c
@@ -17,22 +17,22 @@ struct pair_t {
static int pair_cmp(const void *a, const void *b, void *userdata) {
int i;
int c;
- const char *pa;
- const char *pb;
- size_t l;
+ struct pair_t *pa;
+ struct pair_t *pb;
+ char *ka;
+ char *kb;
- lq_cpy(&l, userdata, sizeof(size_t));
- c = 0;
- for (i = 0; i < l; i++) {
- if (i % 8 == 0) {
- pa = a + c;
- pb = b + c;
- c++;
- }
- if (*pa == *pb) {
+ pa = (struct pair_t*)a;
+ pb = (struct pair_t*)b;
+ ka = pa->key;
+ kb = pb->key;
+ for (i = 0; i < pa->key_len; i++) {
+ if (*ka == *kb) {
+ ka++;
+ kb++;
continue;
}
- if (*pa < *pb) {
+ if (*ka < *kb) {
return -1;
}
return 1;
@@ -42,31 +42,53 @@ static int pair_cmp(const void *a, const void *b, void *userdata) {
}
static long unsigned int pair_hash(const void *item, long unsigned int s0, long unsigned int s1) {
+ unsigned int r;
struct pair_t *o;
o = (struct pair_t*)item;
- return (unsigned int)hashmap_sip(o->key, o->key_len, s0, s1);
+ r = (unsigned int)hashmap_sip(o->key, o->key_len, s0, s1);
+ return r;
}
struct hashmap* lq_mem_init(LQStore *store) {
+ size_t l;
+
+ l = 65;
if (store->userdata == NULL) {
- store->userdata = (void*)hashmap_new(sizeof(struct pair_t) , 0, 0, 0, pair_hash, pair_cmp, NULL, NULL);
+ store->userdata = (void*)hashmap_new(sizeof(struct pair_t) , 0, 0, 0, pair_hash, pair_cmp, NULL, &l);
}
return (struct hashmap *)store->userdata;
}
int lq_mem_content_get(enum payload_e typ, LQStore *store, const char *key, size_t key_len, char *value, size_t *value_len) {
struct hashmap *o;
+ struct pair_t v;
+ struct pair_t *p;
o = lq_mem_init(store);
+
+ v.key = key;
+ v.key_len = key_len;
+
+ p = hashmap_get(o, &v);
+ if (p == NULL) {
+ return ERR_NOENT;
+ }
+
return ERR_OK;
}
int lq_mem_content_put(enum payload_e typ, LQStore *store, const char *key, size_t *key_len, char *value, size_t value_len) {
struct hashmap *o;
+ struct pair_t v;
+
+ v.key = key;
+ v.key_len = *key_len;
+ v.val = value;
+ v.val_len = value_len;
o = lq_mem_init(store);
- hashmap_set(store.userdata);
+ hashmap_set(o, &v);
return ERR_OK;
}
diff --git a/src/test/Makefile b/src/test/Makefile
@@ -5,9 +5,9 @@ LIBS := `pkg-config --libs libtasn1` -L../aux/lib -llash ../asn1/defs_asn1_tab.o
LDFLAGS += $(LIBS)
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
- CK_FORK=no LD_LIBRARY_PATH=`realpath ../aux/lib` ./test_cert_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
test: all
@@ -16,7 +16,7 @@ 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 ../store/dummy.o ../store/file.o ../io/std.o ../lq/msg.o -lcheck
$(CC) $(CFLAGS) $(LDFLAGS) 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 -lcheck
- $(CC) $(CFLAGS) $(LDFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o -lcheck -lhashmap
+ $(CC) $(CFLAGS) $(LDFLAGS) test_trust.c -o test_trust_bin ../crypto/dummy.o ../mem/std.o ../store/mem.o ../lq/trust.o -lcheck -lhashmap
clean:
rm -vf test_*_bin
diff --git a/src/test/test_trust.c b/src/test/test_trust.c
@@ -1,12 +1,74 @@
#include <check.h>
#include <stdlib.h>
+#define LQ_TRUST_FLAG_BITS 13
+
#include "lq/trust.h"
#include "lq/store.h"
#include "lq/err.h"
+#include "lq/mem.h"
+#include "lq/crypto.h"
+
+static const char pubkey_data_alice[65] = { 0x40,
+ 0xde, 0x58, 0x08, 0xe7, 0x24, 0x5e, 0x04, 0x72,
+ 0x7d, 0xb3, 0x83, 0xe4, 0x28, 0x76, 0xfc, 0x02,
+ 0x91, 0xb7, 0xac, 0x31, 0xda, 0x65, 0x9a, 0xc9,
+ 0x80, 0x72, 0xb7, 0x14, 0x87, 0x36, 0x90, 0x29,
+ 0x0c, 0x0e, 0xca, 0x23, 0xa7, 0xb2, 0xc1, 0x38,
+ 0x75, 0x97, 0x41, 0xea, 0x6c, 0xb4, 0xfc, 0x71,
+ 0x91, 0x7a, 0xa6, 0x9f, 0x04, 0xb3, 0x95, 0x10,
+ 0x8b, 0x42, 0xd6, 0x26, 0x10, 0x64, 0x8c, 0xdb,
+};
+
+static const char trust_alice[2] = {
+ 0x00, 0x40,
+};
+
+static const char pubkey_data_bob[65] = {
+ 0x40,
+ 0x79, 0x28, 0x14, 0x6b, 0xb3, 0x19, 0x19, 0xfc,
+ 0xab, 0xb3, 0x23, 0xa3, 0x8b, 0x36, 0xfe, 0x36,
+ 0x33, 0xd7, 0x29, 0x62, 0x6a, 0x2f, 0x1d, 0x11,
+ 0x01, 0x77, 0x93, 0x2e, 0x00, 0xc7, 0x80, 0x8d,
+ 0xaf, 0x17, 0xa1, 0xe2, 0x62, 0xe8, 0xe3, 0xb3,
+ 0xe0, 0x34, 0x33, 0x88, 0xc8, 0x13, 0xe5, 0x52,
+ 0x07, 0x27, 0xfe, 0x4b, 0xa7, 0x9c, 0xa9, 0x45,
+ 0x6c, 0x4d, 0x14, 0x2a, 0x70, 0xec, 0x07, 0x80,
+};
+static const char trust_bob[2] = {
+ 0x01, 0xf0,
+};
+
+extern LQStore LQMemContent;
START_TEST(check_trust_none) {
+ int r;
+ size_t c;
+ char flag_test[2];
+ LQPubKey *pubkey_alice;
+ LQPubKey *pubkey_bob;
+ LQStore *store;
+
+ store = &LQMemContent;
+
+ pubkey_alice = lq_publickey_new(pubkey_data_alice);
+ pubkey_bob = lq_publickey_new(pubkey_data_bob);
+
+ store->put(LQ_CONTENT_KEY, store, pubkey_alice->lokey, &pubkey_alice->lolen, (char*)trust_alice, 2);
+
+ lq_set(flag_test, 0, 2);
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_NONE, flag_test);
+ ck_assert_int_eq(r, 1000000);
+
+ r = lq_trust_check(pubkey_bob, store, TRUST_MATCH_NONE, flag_test);
+ ck_assert_int_eq(r, -1);
+
+ store->put(LQ_CONTENT_KEY, store, pubkey_bob->lokey, &pubkey_bob->lolen, (char*)trust_bob, 2);
+ r = lq_trust_check(pubkey_bob, store, TRUST_MATCH_NONE, flag_test);
+ ck_assert_int_eq(r, 1000000);
+
+
}
END_TEST
