From 73833c010751124051ec8785f70c0b90b0e663d9 Mon Sep 17 00:00:00 2001 From: Carl Niklas Rydberg Date: Sun, 22 Feb 2026 16:34:10 +0100 Subject: [PATCH] Add scriptlab --- CMakeLists.txt | 24 ++++++++++---------- src/adapters/asl_pointer_fs/asl_pointer_fs.c | 2 +- src/adapters/asl_store_fs/asl_store_fs.c | 11 +++++---- src/tools/amduat_conformance_run.c | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c63cc3c..5512b43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -366,7 +366,7 @@ target_include_directories(amduat_test_pel_program_dag PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_pel_program_dag - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME pel_program_dag COMMAND amduat_test_pel_program_dag) @@ -376,7 +376,7 @@ target_include_directories(amduat_test_pel_trace_dag PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_pel_trace_dag - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME pel_trace_dag COMMAND amduat_test_pel_trace_dag) @@ -399,7 +399,7 @@ target_include_directories(amduat_test_pel1_result PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_pel1_result - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME pel1_result COMMAND amduat_test_pel1_result) @@ -410,7 +410,7 @@ target_include_directories(amduat_test_pel1_result_invariants PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_pel1_result_invariants - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME pel1_result_invariants COMMAND amduat_test_pel1_result_invariants) @@ -421,7 +421,7 @@ target_include_directories(amduat_test_asl_log PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_asl_log - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME asl_log COMMAND amduat_test_asl_log) @@ -431,7 +431,7 @@ target_include_directories(amduat_test_asl_core_index PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_asl_core_index - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME asl_core_index COMMAND amduat_test_asl_core_index) @@ -442,7 +442,7 @@ target_include_directories(amduat_test_asl_tgk_exec_plan PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_asl_tgk_exec_plan - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME asl_tgk_exec_plan COMMAND amduat_test_asl_tgk_exec_plan) @@ -452,7 +452,7 @@ target_include_directories(amduat_test_fps PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_fps - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME fps COMMAND amduat_test_fps) @@ -462,7 +462,7 @@ target_include_directories(amduat_test_fcs_pcb1 PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_fcs_pcb1 - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME fcs_pcb1 COMMAND amduat_test_fcs_pcb1) @@ -472,7 +472,7 @@ target_include_directories(amduat_test_tgk1_edge PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_tgk1_edge - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME tgk1_edge COMMAND amduat_test_tgk1_edge) @@ -482,7 +482,7 @@ target_include_directories(amduat_test_fer1_receipt PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_fer1_receipt - PRIVATE amduat_enc amduat_hash_asl1 amduat_asl amduat_util + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME fer1_receipt COMMAND amduat_test_fer1_receipt) @@ -641,7 +641,7 @@ target_include_directories(amduat_test_asl_log_encoding PRIVATE ${AMDUAT_INCLUDE_DIR} ) target_link_libraries(amduat_test_asl_log_encoding - PRIVATE amduat_asl + PRIVATE amduat_enc amduat_asl amduat_hash_asl1 amduat_util ) add_test(NAME asl_log_encoding COMMAND amduat_test_asl_log_encoding) diff --git a/src/adapters/asl_pointer_fs/asl_pointer_fs.c b/src/adapters/asl_pointer_fs/asl_pointer_fs.c index 77cd140..0aca4ca 100644 --- a/src/adapters/asl_pointer_fs/asl_pointer_fs.c +++ b/src/adapters/asl_pointer_fs/asl_pointer_fs.c @@ -187,7 +187,7 @@ bool amduat_asl_pointer_name_is_valid(const char *name) { bool ok = (c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') || - c == '.' || c == '_' || c == '-' || c == '/'; + c == '.' || c == '_' || c == '-' || c == '/' || c == ':'; if (!ok) { return false; } diff --git a/src/adapters/asl_store_fs/asl_store_fs.c b/src/adapters/asl_store_fs/asl_store_fs.c index 7194a8a..a2b67cf 100644 --- a/src/adapters/asl_store_fs/asl_store_fs.c +++ b/src/adapters/asl_store_fs/asl_store_fs.c @@ -2,6 +2,7 @@ #include "asl_store_fs_layout.h" #include "amduat/asl/core.h" +#include "amduat/asl/identity.h" #include "amduat/asl/ref_derive.h" #include "amduat/enc/asl1_core.h" #include "amduat/enc/asl1_core_codec.h" @@ -661,10 +662,12 @@ static amduat_asl_store_error_t amduat_asl_store_fs_get_impl( } stored_octets = amduat_octets(stored_bytes, stored_len); - if (!amduat_hash_asl1_digest(hash_desc->hash_id, - stored_octets, - computed_digest, - hash_desc->digest_len)) { + if (!amduat_hash_asl1_digest_domain( + hash_desc->hash_id, + amduat_asl_identity_domain_separator(), + stored_octets, + computed_digest, + hash_desc->digest_len)) { free(computed_digest); free(stored_bytes); free(objects_path); diff --git a/src/tools/amduat_conformance_run.c b/src/tools/amduat_conformance_run.c index d36b304..394b423 100644 --- a/src/tools/amduat_conformance_run.c +++ b/src/tools/amduat_conformance_run.c @@ -119,7 +119,7 @@ static void json_escape(FILE *out, const char *value) { fputc('"', out); } -static const char *status_string(amduat_conformance_status_t status) { +static const char *status_string(int status) { switch (status) { case AMDUAT_CONFORMANCE_STATUS_PASS: return "PASS";