niklas/amduat
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix build linkages for pel tools

Browse source
This commit is contained in:
Carl Niklas Rydberg 2026-01-23 19:34:53 +01:00
parent 85c23e49eb
commit 3e526975ce
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -296,7 +296,7 @@ target_include_directories(amduat_pel_build
PRIVATE ${AMDUAT_INCLUDE_DIR} PRIVATE ${AMDUAT_INCLUDE_DIR}
) )
target_link_libraries(amduat_pel_build target_link_libraries(amduat_pel_build
PRIVATE amduat_pel amduat_asl amduat_enc amduat_util PRIVATE amduat_pel amduat_asl_store_fs amduat_asl amduat_enc amduat_util
) )
set_target_properties(amduat_pel_build PROPERTIES OUTPUT_NAME amduat-pel-build) set_target_properties(amduat_pel_build PROPERTIES OUTPUT_NAME amduat-pel-build)
@ -330,7 +330,8 @@ target_include_directories(amduat_test_pel_program_build_concat
PRIVATE ${AMDUAT_INCLUDE_DIR} PRIVATE ${AMDUAT_INCLUDE_DIR}
) )
target_link_libraries(amduat_test_pel_program_build_concat target_link_libraries(amduat_test_pel_program_build_concat
PRIVATE amduat_pel amduat_asl amduat_enc amduat_hash_asl1 amduat_util PRIVATE amduat_pel amduat_asl_store_fs amduat_asl amduat_enc
amduat_hash_asl1 amduat_util
) )
add_test(NAME pel_program_build_concat COMMAND amduat_test_pel_program_build_concat) add_test(NAME pel_program_build_concat COMMAND amduat_test_pel_program_build_concat)
@ -536,7 +537,7 @@ target_include_directories(amduat_test_pel_program_dag_exec
PRIVATE ${AMDUAT_INCLUDE_DIR} PRIVATE ${AMDUAT_INCLUDE_DIR}
) )
target_link_libraries(amduat_test_pel_program_dag_exec target_link_libraries(amduat_test_pel_program_dag_exec
PRIVATE amduat_pel PRIVATE amduat_pel amduat_asl_store_fs
) )
add_test(NAME pel_program_dag_exec COMMAND amduat_test_pel_program_dag_exec) add_test(NAME pel_program_dag_exec COMMAND amduat_test_pel_program_dag_exec)
@ -568,7 +569,7 @@ target_include_directories(amduat_test_pel_surf_run
PRIVATE ${AMDUAT_INCLUDE_DIR} PRIVATE ${AMDUAT_INCLUDE_DIR}
) )
target_link_libraries(amduat_test_pel_surf_run target_link_libraries(amduat_test_pel_surf_run
PRIVATE amduat_pel PRIVATE amduat_pel amduat_asl_store_fs
) )
add_test(NAME pel_surf_run COMMAND amduat_test_pel_surf_run) add_test(NAME pel_surf_run COMMAND amduat_test_pel_surf_run)

18
src/core/derivation_sid.c
View file

@ -74,8 +74,7 @@ bool amduat_pel_derivation_sid_compute(
/* ReferenceBytes are self-delimiting because hash_id implies digest_len. */ /* ReferenceBytes are self-delimiting because hash_id implies digest_len. */
ok = amduat_enc_asl1_core_encode_reference_v1(in->program_ref, &ref_bytes); ok = amduat_enc_asl1_core_encode_reference_v1(in->program_ref, &ref_bytes);
if (!ok || if (!ok ||
!amduat_hash_asl1_stream_update(&stream, ref_bytes.data, !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
ref_bytes.len)) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
free((void *)ref_bytes.data); free((void *)ref_bytes.data);
return false; return false;
@ -88,8 +87,7 @@ bool amduat_pel_derivation_sid_compute(
bool ok = amduat_enc_asl1_core_encode_reference_v1(in->input_refs[i], bool ok = amduat_enc_asl1_core_encode_reference_v1(in->input_refs[i],
&ref_bytes); &ref_bytes);
if (!ok || if (!ok ||
!amduat_hash_asl1_stream_update(&stream, ref_bytes.data, !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
ref_bytes.len)) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
free((void *)ref_bytes.data); free((void *)ref_bytes.data);
return false; return false;
@ -98,7 +96,8 @@ bool amduat_pel_derivation_sid_compute(
} }
marker = in->has_params_ref ? 0x01u : 0x00u; marker = in->has_params_ref ? 0x01u : 0x00u;
if (!amduat_hash_asl1_stream_update(&stream, &marker, 1u)) { if (!amduat_hash_asl1_stream_update(&stream,
amduat_octets(&marker, 1u))) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
return false; return false;
} }
@ -107,8 +106,7 @@ bool amduat_pel_derivation_sid_compute(
bool ok = amduat_enc_asl1_core_encode_reference_v1(in->params_ref, bool ok = amduat_enc_asl1_core_encode_reference_v1(in->params_ref,
&ref_bytes); &ref_bytes);
if (!ok || if (!ok ||
!amduat_hash_asl1_stream_update(&stream, ref_bytes.data, !amduat_hash_asl1_stream_update(&stream, ref_bytes)) {
ref_bytes.len)) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
free((void *)ref_bytes.data); free((void *)ref_bytes.data);
return false; return false;
@ -118,7 +116,8 @@ bool amduat_pel_derivation_sid_compute(
/* ExecProfile is currently absent; presence must be explicitly marked. */ /* ExecProfile is currently absent; presence must be explicitly marked. */
marker = in->has_exec_profile ? 0x01u : 0x00u; marker = in->has_exec_profile ? 0x01u : 0x00u;
if (!amduat_hash_asl1_stream_update(&stream, &marker, 1u)) { if (!amduat_hash_asl1_stream_update(&stream,
amduat_octets(&marker, 1u))) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
return false; return false;
} }
@ -127,8 +126,7 @@ bool amduat_pel_derivation_sid_compute(
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
return false; return false;
} }
if (!amduat_hash_asl1_stream_update(&stream, in->exec_profile.data, if (!amduat_hash_asl1_stream_update(&stream, in->exec_profile)) {
in->exec_profile.len)) {
amduat_hash_asl1_stream_destroy(&stream); amduat_hash_asl1_stream_destroy(&stream);
return false; return false;
} }

2
src/tools/amduat_pel_cli.c
View file

@ -3,6 +3,8 @@
#include "amduat/asl/asl_materialization_cache_fs.h" #include "amduat/asl/asl_materialization_cache_fs.h"
#include "amduat/asl/asl_pointer_fs.h" #include "amduat/asl/asl_pointer_fs.h"
#include "amduat/asl/log_store.h" #include "amduat/asl/log_store.h"
#include "amduat/asl/collection.h"
#include "amduat/asl/record.h"
#include "amduat/asl/asl_store_fs.h" #include "amduat/asl/asl_store_fs.h"
#include "amduat/asl/asl_store_fs_meta.h" #include "amduat/asl/asl_store_fs_meta.h"
#include "amduat/asl/io.h" #include "amduat/asl/io.h"