commit 42c26c7271955b129ecacb4ab0141ef03e19eb2b
parent 8b07b04885e311e6540231ea57423444b0af5bcd
Author: finwo <finwo@pm.me>
Date: Fri, 9 Oct 2026 19:37:32 +0200
More sanity checks
Diffstat:
2 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/src/sfinx.c b/src/sfinx.c
@@ -265,7 +265,7 @@ static inline void _sfinx_subtree_verify(sfinx_hash hash, const uint8_t *prefix,
sfinx_status sfinx_single_public_key(sfinx_hash hash, const uint8_t *seed, size_t seed_len, uint8_t *pubkey_out,
size_t pubkey_cap, size_t *pubkey_len_out) {
size_t len = sfinx_hash_len(hash);
- if (len == 0 || seed_len > SFINX_SEED_LEN_MAX) {
+ if (len == 0 || !seed || seed_len > SFINX_SEED_LEN_MAX) {
return SFINX_ERR_ARGS;
}
if (!pubkey_out || pubkey_cap < len) {
@@ -283,7 +283,7 @@ sfinx_status sfinx_single_sign(sfinx_hash hash, const uint8_t *seed, size_t seed
size_t len = sfinx_hash_len(hash);
size_t need = sfinx_signature_len(hash, 0);
uint8_t org[SFINX_HASH_LEN_MAX];
- if (len == 0 || seed_len > SFINX_SEED_LEN_MAX) {
+ if (len == 0 || !seed || !msg || seed_len > SFINX_SEED_LEN_MAX) {
return SFINX_ERR_ARGS;
}
if (!sig || sig_cap < need) {
@@ -304,7 +304,7 @@ sfinx_status sfinx_single_sign(sfinx_hash hash, const uint8_t *seed, size_t seed
sfinx_status sfinx_tree_public_key(sfinx_hash hash, const uint8_t *seed, size_t seed_len, uint8_t *pubkey_out,
size_t pubkey_cap, size_t *pubkey_len_out) {
size_t len = sfinx_hash_len(hash);
- if (len == 0 || seed_len > SFINX_SEED_LEN_MAX) {
+ if (len == 0 || !seed || seed_len > SFINX_SEED_LEN_MAX) {
return SFINX_ERR_ARGS;
}
if (!pubkey_out || pubkey_cap < len) {
@@ -333,7 +333,8 @@ sfinx_status sfinx_tree_sign(sfinx_hash hash, const uint8_t *seed, size_t seed_l
uint8_t *joined;
size_t at;
- if (len == 0 || seed_len > SFINX_SEED_LEN_MAX || !path || path_len == 0 || !sfinx_path_len_valid(path_len)) {
+ if (len == 0 || !seed || !msg || seed_len > SFINX_SEED_LEN_MAX || !path || path_len == 0 ||
+ !sfinx_path_len_valid(path_len)) {
return SFINX_ERR_ARGS;
}
if (!sig || sig_cap < need) {
@@ -408,7 +409,7 @@ sfinx_status sfinx_verify(const uint8_t *pubkey, size_t pubkey_len, const uint8_
const uint8_t *path;
uint8_t *joined;
- if (!pubkey || !sig || sig_len < 2) {
+ if (!pubkey || !msg || !sig || sig_len < 2) {
return SFINX_ERR_ARGS;
}
path_len = _sfinx_e4m4_decode(sig[0]);
@@ -519,6 +520,9 @@ sfinx_status sfinx_signature_info(const uint8_t *sig, size_t sig_len, sfinx_hash
}
sfinx_status sfinx_random_bytes(uint8_t *out, size_t len) {
+ if (!out) {
+ return SFINX_ERR_ARGS;
+ }
while (len > 0) {
size_t chunk = len > 256 ? 256 : len;
if (getentropy(out, chunk) != 0) {
diff --git a/test/06-api.c b/test/06-api.c
@@ -1,17 +1,17 @@
-#include "src/sfinx.c"
-#include "_tap.c"
-
#include <string.h>
+#include "_tap.c"
+#include "src/sfinx.c"
+
static void check_size(size_t got, size_t want, const char *what) {
tap(got == want, what, "got %zu, want %zu", got, want);
}
int main(void) {
- uint8_t sig[3] = {0x01, 0xaa, 0x20};
- uint8_t bad[3] = {0x41, 0xaa, 0x20};
- sfinx_hash hash = SFINX_HASH_224;
- size_t path_len = 99;
+ uint8_t sig[3] = {0x01, 0xaa, 0x20};
+ uint8_t bad[3] = {0x41, 0xaa, 0x20};
+ sfinx_hash hash = SFINX_HASH_224;
+ size_t path_len = 99;
tap_begin("sfinx api");
@@ -36,7 +36,29 @@ int main(void) {
check_size(path_len, 1, "signature_info path_len");
tap(hash == SFINX_HASH_256, "signature_info hash", "got %d", (int)hash);
tap(sfinx_signature_info(sig, sizeof(sig), NULL, NULL) == SFINX_OK, "signature_info accepts NULL outs", "failed");
- tap(sfinx_signature_info(bad, sizeof(bad), NULL, NULL) == SFINX_ERR_FORMAT, "signature_info rejects bad N", "accepted");
+ tap(sfinx_signature_info(bad, sizeof(bad), NULL, NULL) == SFINX_ERR_FORMAT, "signature_info rejects bad N",
+ "accepted");
+
+ uint8_t buf[64];
+ tap(sfinx_signature_info(NULL, sizeof(sig), NULL, NULL) == SFINX_ERR_ARGS, "signature_info rejects NULL sig",
+ "accepted");
+ tap(sfinx_single_public_key(SFINX_HASH_256, NULL, 4, buf, sizeof(buf), NULL) == SFINX_ERR_ARGS,
+ "single_public_key rejects NULL seed", "accepted");
+ tap(sfinx_single_public_key(SFINX_HASH_256, (const uint8_t *)"seed", 4, NULL, sizeof(buf), NULL) == SFINX_ERR_NOSPACE,
+ "single_public_key rejects NULL out", "accepted");
+ tap(sfinx_single_sign(SFINX_HASH_256, NULL, 4, (const uint8_t *)"m", 1, buf, sizeof(buf), NULL) == SFINX_ERR_ARGS,
+ "single_sign rejects NULL seed", "accepted");
+ tap(sfinx_single_sign(SFINX_HASH_256, (const uint8_t *)"seed", 4, NULL, 1, buf, sizeof(buf), NULL) == SFINX_ERR_ARGS,
+ "single_sign rejects NULL msg", "accepted");
+ tap(sfinx_tree_public_key(SFINX_HASH_256, NULL, 4, buf, sizeof(buf), NULL) == SFINX_ERR_ARGS,
+ "tree_public_key rejects NULL seed", "accepted");
+ tap(sfinx_tree_sign(SFINX_HASH_256, NULL, 4, (const uint8_t *)"\x20", 1, (const uint8_t *)"m", 1, buf, sizeof(buf),
+ NULL) == SFINX_ERR_ARGS,
+ "tree_sign rejects NULL seed", "accepted");
+ tap(sfinx_verify(NULL, 32, (const uint8_t *)"m", 1, sig, sizeof(sig)) == SFINX_ERR_ARGS, "verify rejects NULL pubkey",
+ "accepted");
+ tap(sfinx_verify(buf, 32, NULL, 1, sig, sizeof(sig)) == SFINX_ERR_ARGS, "verify rejects NULL msg", "accepted");
+ tap(sfinx_random_bytes(NULL, 4) == SFINX_ERR_ARGS, "random_bytes rejects NULL out", "accepted");
return tap_plan();
}