commit e13dfb34f5e8975fcd1f2fd454ed2c2ad68efb6f
parent f45c36dede6c9add976bc98ed1c0ce333850fbc1
Author: lash <dev@holbrook.no>
Date: Mon, 3 Mar 2025 03:23:44 +0000
Complete trust tests; WIP: flaky
Diffstat:
4 files changed, 86 insertions(+), 28 deletions(-)
diff --git a/src/lq/trust.c b/src/lq/trust.c
@@ -3,17 +3,17 @@
#include "lq/err.h"
-int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, const char *flags) {
+int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, const unsigned char *flags) {
int r;
size_t l;
int i;
int ii;
- char m;
+ unsigned char m;
int match;
int match_req;
- char v[3];
+ unsigned char v[3];
double z;
- char key_flags[(int)((LQ_TRUST_FLAG_BITS - 1)/8+1)];
+ unsigned char key_flags[(int)((LQ_TRUST_FLAG_BITS - 1)/8+1)];
l = (int)((LQ_TRUST_FLAG_BITS - 1)/8+1);
r = store->get(LQ_CONTENT_KEY, store, pubkey->lokey, pubkey->lolen, key_flags, &l);
@@ -28,20 +28,21 @@ int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, con
match = 0;
match_req = 0;
z = 0.f;
+ m = 0;
+ ii = 0;
for (i = 0; i < LQ_TRUST_FLAG_BITS; i++) {
- ii = i % 8;
- if (ii == 0) {
- v[1] = *(flags + i);
- v[2] = key_flags[(int)(i / 8)];
+ if (m == 0) {
+ v[1] = *(flags + ii);
+ v[2] = key_flags[ii];
m = 0x80;
+ ii++;
}
v[0] = v[1] & m;
if (v[0] > 0) {
match_req++;
if ((v[2] & m) > 0) {
match++;
- z += 1 / LQ_TRUST_FLAG_BITS;
}
}
if (match > 0) {
@@ -52,9 +53,11 @@ int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, con
m >>= 1;
}
if (mode == TRUST_MATCH_ALL) {
- if (match < match_req) {
+ if (match != match_req) {
return 0;
- }
+ }
+ return 1000000;
}
- return (int)(z * 1000000.f);
+ z = (double)match / (double)match_req;
+ return (int)(z * 1000000);
}
diff --git a/src/lq/trust.h b/src/lq/trust.h
@@ -2,7 +2,7 @@
#define LIBQAEDA_TRUST_H_
#ifndef LQ_TRUST_FLAG_BITS
-#define LQ_TRUST_FLAG_BITS 8
+#define LQ_TRUST_FLAG_BITS 13
#endif
#include "lq/crypto.h"
@@ -15,7 +15,7 @@ enum trust_mode_e {
TRUST_MATCH_ALL,
};
-int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, const char *flags);
+int lq_trust_check(LQPubKey *pubkey, LQStore *store, enum trust_mode_e mode, const unsigned char *flags);
#endif // LIBQAEDA_TRUST_H_
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
diff --git a/src/test/test_trust.c b/src/test/test_trust.c
@@ -1,8 +1,6 @@
#include <check.h>
#include <stdlib.h>
-#define LQ_TRUST_FLAG_BITS 13
-
#include "lq/trust.h"
#include "lq/store.h"
#include "lq/err.h"
@@ -20,8 +18,8 @@ static const char pubkey_data_alice[65] = { 0x40,
0x8b, 0x42, 0xd6, 0x26, 0x10, 0x64, 0x8c, 0xdb,
};
-static const char trust_alice[2] = {
- 0x00, 0x40,
+static const unsigned char trust_alice[2] = {
+ 0x01, 0x78,
};
static const char pubkey_data_bob[65] = {
@@ -36,8 +34,8 @@ static const char pubkey_data_bob[65] = {
0x6c, 0x4d, 0x14, 0x2a, 0x70, 0xec, 0x07, 0x80,
};
-static const char trust_bob[2] = {
- 0x01, 0xf0,
+static const unsigned char trust_bob[2] = {
+ 0x00, 0x40,
};
extern LQStore LQMemContent;
@@ -45,7 +43,7 @@ extern LQStore LQMemContent;
START_TEST(check_trust_none) {
int r;
size_t c;
- char flag_test[2];
+ unsigned char flag_test[2];
LQPubKey *pubkey_alice;
LQPubKey *pubkey_bob;
LQStore *store;
@@ -55,7 +53,7 @@ START_TEST(check_trust_none) {
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);
+ store->put(LQ_CONTENT_KEY, store, pubkey_alice->lokey, &pubkey_alice->lolen, (unsigned char*)trust_alice, 2);
lq_set(flag_test, 0, 2);
r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_NONE, flag_test);
@@ -64,23 +62,80 @@ START_TEST(check_trust_none) {
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);
+ store->put(LQ_CONTENT_KEY, store, pubkey_bob->lokey, &pubkey_bob->lolen, (unsigned char*)trust_bob, 2);
r = lq_trust_check(pubkey_bob, store, TRUST_MATCH_NONE, flag_test);
ck_assert_int_eq(r, 1000000);
-
-
}
END_TEST
START_TEST(check_trust_one) {
+ int r;
+ size_t c;
+ unsigned char flag_test[2];
+ LQPubKey *pubkey_alice;
+ LQStore *store;
+
+ store = &LQMemContent;
+
+ pubkey_alice = lq_publickey_new(pubkey_data_alice);
+
+ store->put(LQ_CONTENT_KEY, store, pubkey_alice->lokey, &pubkey_alice->lolen, (unsigned char*)trust_alice, 2);
+
+ flag_test[0] = 0;
+ flag_test[1] = 0x40;
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_ONE, (const unsigned char*)flag_test);
+ ck_assert_int_eq(r, 1000000);
}
END_TEST
START_TEST(check_trust_best) {
+ int r;
+ size_t c;
+ unsigned char flag_test[2];
+ LQPubKey *pubkey_alice;
+ LQStore *store;
+
+ store = &LQMemContent;
+
+ pubkey_alice = lq_publickey_new(pubkey_data_alice);
+
+ store->put(LQ_CONTENT_KEY, store, pubkey_alice->lokey, &pubkey_alice->lolen, (unsigned char*)trust_alice, 2);
+
+ flag_test[0] = 0x13;
+ flag_test[1] = 0x60;
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_BEST, (const unsigned char*)flag_test);
+ ck_assert_int_eq(r, 600000);
+
}
END_TEST
START_TEST(check_trust_all) {
+ int r;
+ size_t c;
+ unsigned char flag_test[2];
+ LQPubKey *pubkey_alice;
+ LQStore *store;
+
+ store = &LQMemContent;
+
+ pubkey_alice = lq_publickey_new(pubkey_data_alice);
+
+ store->put(LQ_CONTENT_KEY, store, pubkey_alice->lokey, &pubkey_alice->lolen, (unsigned char*)trust_alice, 2);
+
+ flag_test[0] = 0x13;
+ flag_test[1] = 0x60;
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_ALL, (const unsigned char*)flag_test);
+ ck_assert_int_eq(r, 0);
+
+ flag_test[0] = 0xff;
+ flag_test[1] = 0xff;
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_ALL, (const unsigned char*)flag_test);
+ ck_assert_int_eq(r, 0);
+
+ flag_test[0] = 0x01;
+ flag_test[1] = 0x78;
+ r = lq_trust_check(pubkey_alice, store, TRUST_MATCH_ALL, (const unsigned char*)flag_test);
+ ck_assert_int_eq(r, 1000000);
}
END_TEST
