pack() derived the content key, the ephemeral X25519 private key and every nonce base from an 8-bit nonceSeed. Anyone holding a package could try the 256 seeds and recover its content key without the base private key. The content key, ephemeral key, wrap nonce and nonce bases now come from the OS CSPRNG (BCryptGenRandom / getrandom / arc4random_buf). Nonce bases are redrawn until distinct within a package. The seeded path survives only as insecureDeterministicForTests + testSeed, honoured only when built with ANSMODEL_DETERMINISTIC_PACK_FOR_TESTS; otherwise pack() refuses. The on-disk format is unchanged. Same change in ANSTSCORE, ANSMINDCORE and ANSCORE, which keep pack() in step. Regression test: two packs of identical inputs have different content keys, ephemeral keys, wrap nonces and ciphertext, neither key is one a seed could make, and both still open with the base key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
49 lines
2.3 KiB
CMake
49 lines
2.3 KiB
CMake
# ANSModelPackage — reading an ANS model package (.ansmodel).
|
|
#
|
|
# Header-only apart from the vendored curves, and deliberately free of the
|
|
# heavy dependencies around it: no CUDA, no OpenCV, no LabVIEW. That is what
|
|
# lets it build — and be tested — on every platform, including the ones where
|
|
# the engine layer does not build at all.
|
|
add_library(ANSModelPackage STATIC
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher/monocypher.c
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher/monocypher-ed25519.c
|
|
)
|
|
|
|
target_include_directories(ANSModelPackage PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher
|
|
)
|
|
|
|
# nlohmann/json, wherever this machine keeps it: the ANSLibs tree on Windows,
|
|
# vcpkg, or the system elsewhere. Asked for by name rather than assumed — the
|
|
# Windows branch used to point at vcpkg alone, and on a real build machine the
|
|
# header lives under ANSLibs, so every target that linked this one failed to
|
|
# find it while the engines, which add ANSLibs themselves, compiled fine.
|
|
find_path(ANSCORE_NLOHMANN_INCLUDE nlohmann/json.hpp
|
|
HINTS ${ANSLIBS_DIR} ${VCPKG_INCLUDE_DIR}
|
|
/opt/homebrew/include /usr/local/include /usr/include)
|
|
if(ANSCORE_NLOHMANN_INCLUDE)
|
|
target_include_directories(ANSModelPackage PUBLIC ${ANSCORE_NLOHMANN_INCLUDE})
|
|
message(STATUS "ANSModelPackage: nlohmann/json at ${ANSCORE_NLOHMANN_INCLUDE}")
|
|
else()
|
|
message(WARNING "nlohmann/json.hpp not found — ANSModelPackage will not build")
|
|
endif()
|
|
|
|
# The model-package key, decided at configure time: see ANSModelKeys.h for why
|
|
# this is not an __has_include test. PUBLIC so every engine that opens a
|
|
# package is compiled with the same answer.
|
|
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ANSModelKeysGenerated.h")
|
|
target_compile_definitions(ANSModelPackage PUBLIC ANSCORE_HAVE_BUILTIN_MODEL_KEYS=1)
|
|
message(STATUS "ANSModelPackage: key present — packages can be opened")
|
|
else()
|
|
message(STATUS "ANSModelPackage: no key — packages cannot be opened "
|
|
"(run ansmodel-keys emit --product anscore, then re-run cmake)")
|
|
endif()
|
|
|
|
# BCryptGenRandom, behind the content key and nonces pack() draws (ANSCsprng.h).
|
|
if(WIN32)
|
|
target_link_libraries(ANSModelPackage PUBLIC bcrypt)
|
|
endif()
|
|
|
|
set_target_properties(ANSModelPackage PROPERTIES POSITION_INDEPENDENT_CODE ON)
|