Sign accounts and draw random bytes through the Oqs package
Account key pairs, signatures, secure random bytes, and wiping secrets now go through ziranlang/oqs, the Ziran binding for liboqs, instead of Inbe's own OQS_* declarations and size_t shim. Inbe still builds the same ML-DSA-44 liboqs from its locked source, which Oqs shares. Every build and test that compiles the account modules finds the package, and the account, device key, and Daochi tests stub liboqs by its own names.
This commit is contained in:
1 parent
0bf60d300e
commit
39f047d3ea
42 files changed
+108
-90
No files matched your search
@@ -181,6 +181,7 @@ SOCIAL_PY ?= $(if $(wildcard .local/social-venv/bin/python),.local/social-venv/b
|
||||
|
||||
KRYON_DIR ?= build/packages/kryon
|
||||
KSS_DIR ?= build/packages/kss
|
||||
OQS_DIR ?= build/packages/oqs
|
||||
KRYON_BACKEND ?= raylib
|
||||
ifeq ($(KRYON_BACKEND),tui)
|
||||
KRYON_BACKEND := termi
|
||||
@@ -888,7 +889,7 @@ $(KRY_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME2D_M
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --prune-stale --root . \
|
||||
$(foreach define,$(ZI_NATIVE_DEFINES),--define $(define)) \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -902,7 +903,7 @@ $(WEB_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME2D_M
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --root . \
|
||||
--define PLATFORM_WEB --define __EMSCRIPTEN__ \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -921,7 +922,7 @@ $(WINDOWS_GEN_STAMP): Makefile $(ZI2C_BIN) $(ZI_SRCS) $(KRYON_ZI_MODULES) $(GAME
|
||||
--define PLATFORM_DESKTOP --define _WIN32 \
|
||||
--define DESKTOP_TRAY_ENABLED \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
@@ -948,7 +949,7 @@ zi-c-plan9: $(KRY_GEN_STAMP)
|
||||
sh scripts/run-ziran.sh $(ZI2C_BIN) --no-main --plan9 --define PLAN9_BUILD \
|
||||
--define KRYON_PLATFORM_PLAN9 --root . \
|
||||
--module-path src --module-path $(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KSS_DIR)/src --module-path $(OQS_DIR)/src --module-path kryon=$(KRYON_DIR)/src/ui \
|
||||
--module-path $(KRYON_DIR)/src/backend \
|
||||
--module-path $(GAME2D_DIR)/src \
|
||||
--module-path $(ZIRAN_DIR)/std \
|
||||
|
||||
@@ -78,7 +78,7 @@ set(APP_ZIRAN_MANIFEST "${CMAKE_BINARY_DIR}/ziran/generated-sources.cmake")
|
||||
file(GLOB_RECURSE APP_ZIRAN_SOURCES CONFIGURE_DEPENDS "${SRC_DIR}/*.zi")
|
||||
file(GLOB_RECURSE APP_LIBRARY_ZIRAN_SOURCES CONFIGURE_DEPENDS
|
||||
"${KRYON_DIR}/src/ui/*.zi" "${KRYON_DIR}/src/backend/*.zi"
|
||||
"${REPO_ROOT}/build/packages/kss/src/*.zi" "${REPO_ROOT}/build/packages/game2d/src/*.zi"
|
||||
"${REPO_ROOT}/build/packages/kss/src/*.zi" "${REPO_ROOT}/build/packages/oqs/src/*.zi" "${REPO_ROOT}/build/packages/game2d/src/*.zi"
|
||||
"${ZIRAN_DIR}/std/*.zi" "${REPO_ROOT}/build/packages/daochi-client/*.zi")
|
||||
set(APP_ZIRAN_DEFINES --define ANDROID_BUILD)
|
||||
set(APP_ZIRAN_CHECK_DEFINES "ANDROID_BUILD")
|
||||
|
||||
@@ -44,6 +44,8 @@ result = subprocess.run(
|
||||
str(ui),
|
||||
"--module-path",
|
||||
str(kss),
|
||||
"--module-path",
|
||||
str(root / "build/packages/oqs/src"),
|
||||
# KSS imports Kryon as kryon/NAME.
|
||||
"--module-path",
|
||||
f"kryon={ui}",
|
||||
|
||||
@@ -27,6 +27,7 @@ for name in args.define:
|
||||
command.extend(["--define", name])
|
||||
for directory in (
|
||||
root / "src", kryon / "src/ui", kryon / "src/backend", root / "build/packages/kss/src",
|
||||
root / "build/packages/oqs/src",
|
||||
root / "build/packages/game2d/src", root / "build/packages/ziran/std", root / "build/packages/daochi-client",
|
||||
):
|
||||
command.extend(["--module-path", str(directory)])
|
||||
|
||||
Executable → Regular
+1
@@ -83,6 +83,7 @@ link() {
|
||||
link ziran ziran
|
||||
link kryon kryon
|
||||
link kss kss
|
||||
link oqs oqs
|
||||
link raylib raylib
|
||||
link game2d game2d
|
||||
link daochi-client daochi_client
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
#import, file "account_types.zi";
|
||||
#import, file "sync_crypto.zi";
|
||||
#import "oqs"
|
||||
|
||||
// ML-DSA-44's fixed wire sizes are part of Inbe's account format.
|
||||
AccountPublicKeyBytes :: 1312
|
||||
@@ -28,9 +29,6 @@ AccountValuesEqual :: (left: *SyncAccount, right: *SyncAccount) -> bool {
|
||||
return difference == 0
|
||||
}
|
||||
|
||||
c :: #system_library "c";
|
||||
OqsAccountKeyPair :: (public_key: *u8, private_key: *u8) -> s32 #foreign c "OQS_SIG_ml_dsa_44_keypair";
|
||||
|
||||
#program_export
|
||||
CreateSyncAccount :: (account: *SyncAccount) -> s32 {
|
||||
if account == null {
|
||||
@@ -40,7 +38,7 @@ CreateSyncAccount :: (account: *SyncAccount) -> s32 {
|
||||
private_key: [AccountPrivateKeyBytes]u8
|
||||
generated: SyncAccount = .{}
|
||||
|
||||
if OqsAccountKeyPair(*public_key[0], *private_key[0]) != 0 {
|
||||
if !MlDsa44KeyPair(public_key[:], private_key[:]) {
|
||||
return 0
|
||||
}
|
||||
SyncCryptoSha256Hex(*public_key[0], AccountPublicKeyBytes,
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
// Target-sized liboqs lengths and platform export effects for account files.
|
||||
// Platform export effects for account files.
|
||||
c :: #system_library "c";
|
||||
|
||||
NativeAccountSign :: (signature: *u8, signature_length: *usize,
|
||||
message: *u8, message_length: usize,
|
||||
private_key: *u8) -> s32 #foreign c "OQS_SIG_ml_dsa_44_sign";
|
||||
|
||||
#if #defined(ANDROID_BUILD) {
|
||||
NativeAccountShare :: (data: *u8, length: usize, filename: *u8,
|
||||
mime: *u8, title: *u8) -> s32 #foreign c "android_share_bytes";
|
||||
@@ -56,21 +52,3 @@ inbe_account_download_file :: (path: *u8, filename: *u8,
|
||||
return 0
|
||||
}
|
||||
|
||||
#program_export
|
||||
inbe_oqs_ml_dsa_44_sign :: (signature: *u8,
|
||||
signature_length: *u64, message: *u8,
|
||||
message_length: u64, private_key: *u8) -> s32 {
|
||||
if signature == null || signature_length == null || private_key == null ||
|
||||
(message == null && message_length > 0) {
|
||||
return -1
|
||||
}
|
||||
if size_of(usize) < 8 && message_length > 4294967295 {
|
||||
return -1
|
||||
}
|
||||
signature_length.* = 0
|
||||
native_length: usize = 0
|
||||
result := NativeAccountSign(signature, *native_length, message,
|
||||
cast(usize)message_length, private_key)
|
||||
signature_length.* = cast(u64)native_length
|
||||
return result
|
||||
}
|
||||
@@ -1,15 +1,11 @@
|
||||
#import, file "account_types.zi";
|
||||
#import, file "sync_crypto.zi";
|
||||
#import "byte_text_linux"
|
||||
#import "oqs"
|
||||
|
||||
AccountSignatureBytes :: 2420
|
||||
AccountSigningKeyBytes :: 2560
|
||||
|
||||
c :: #system_library "c";
|
||||
// The Ziran host converts fixed-width values to the target's size_t.
|
||||
OqsAccountSign :: (signature: *u8, signature_length: *u64,
|
||||
message: *u8, message_length: u64, private_key: *u8) -> s32 #foreign c "inbe_oqs_ml_dsa_44_sign";
|
||||
|
||||
SigningKeyText :: (data: *u8, capacity: s64) -> string {
|
||||
if data == null || capacity <= 0 { return "" }
|
||||
length: s64 = 0
|
||||
@@ -53,10 +49,10 @@ SignSyncAccountHex :: (account: *SyncAccount, message: *u8,
|
||||
return 0
|
||||
}
|
||||
signature: [AccountSignatureBytes]u8
|
||||
signature_length: u64 = 0
|
||||
if OqsAccountSign(*signature[0], *signature_length, message,
|
||||
cast(u64)message_length, *private_key[0]) != 0 ||
|
||||
signature_length != AccountSignatureBytes { return 0 }
|
||||
if MlDsa44Sign(signature[:], BytesFromPointer(message,
|
||||
cast(u64)message_length), private_key[:]) != AccountSignatureBytes {
|
||||
return 0
|
||||
}
|
||||
return SyncCryptoBytesToHex(*signature[0], AccountSignatureBytes,
|
||||
output, output_size)
|
||||
}
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
c :: #system_library "c";
|
||||
OqsRandomBytesRaw :: (output: *u8, length: usize) #foreign c "OQS_randombytes";
|
||||
OqsCleanseRaw :: (output: *void, length: u64) #foreign c "OQS_MEM_cleanse";
|
||||
#import "byte_text_linux"
|
||||
#import "oqs"
|
||||
|
||||
#program_export
|
||||
SyncCryptoRandom :: (output: *u8, length: s64) -> s32 {
|
||||
@@ -11,7 +10,7 @@ SyncCryptoRandom :: (output: *u8, length: s64) -> s32 {
|
||||
return 0
|
||||
}
|
||||
if length > 0 {
|
||||
OqsRandomBytesRaw(output, cast(usize)length)
|
||||
RandomBytes(BytesFromPointer(output, cast(u64)length))
|
||||
}
|
||||
return 1
|
||||
}
|
||||
@@ -19,5 +18,5 @@ SyncCryptoRandom :: (output: *u8, length: s64) -> s32 {
|
||||
#program_export
|
||||
SyncCryptoWipe :: (output: *u8, length: s64) {
|
||||
if output == null || length <= 0 { return }
|
||||
OqsCleanseRaw(cast(*void)output, cast(u64)length)
|
||||
Cleanse(BytesFromPointer(output, cast(u64)length))
|
||||
}
|
||||
@@ -5,5 +5,6 @@ bin=${1:-"$root/build/ziran-toolchain/bin"}
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
"$root/src/platform/android/android_health.zi"
|
||||
exec python3 "$root/tests/android_jni_zi_test.py" "$bin"
|
||||
@@ -10,10 +10,12 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
"$root/src/platform/android/android_lifecycle.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
-o "$work/gen" "$root/src/platform/android/android_lifecycle.zi" \
|
||||
"$root/src/app/current_app.zi" "$root/src/app/exercise_types.zi" \
|
||||
"$root/src/app/practice_lifecycle.zi"
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
int32_t inbe_oqs_ml_dsa_44_sign(uint8_t *signature,
|
||||
uint64_t *signature_length,
|
||||
uint8_t *message,
|
||||
uint64_t message_length,
|
||||
uint8_t *private_key)
|
||||
/* liboqs stands in for the signer: it checks the exact bytes each Daochi
|
||||
* message signs and returns a recognizable signature. */
|
||||
int32_t OQS_SIG_ml_dsa_44_sign(uint8_t *signature, size_t *signature_length,
|
||||
const uint8_t *message, size_t message_length,
|
||||
const uint8_t *private_key)
|
||||
{
|
||||
const char login[] = "daochi-sync-v1\nPOST\n/api/v1/sync/login\n";
|
||||
const char registration[] = "daochi-device-registration-v1\n";
|
||||
@@ -44,15 +44,34 @@ int32_t inbe_oqs_ml_dsa_44_sign(uint8_t *signature,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t inbe_oqs_random_bytes(uint8_t *output, uint64_t length)
|
||||
void OQS_randombytes(uint8_t *output, size_t length)
|
||||
{
|
||||
static uint8_t next = 1;
|
||||
assert(length == 32);
|
||||
memset(output, next++, length);
|
||||
return 1;
|
||||
}
|
||||
|
||||
void OQS_MEM_cleanse(void *output, uint64_t length)
|
||||
int32_t OQS_SIG_ml_dsa_44_keypair(uint8_t *public_key, uint8_t *secret_key)
|
||||
{
|
||||
(void)public_key;
|
||||
(void)secret_key;
|
||||
return -1;
|
||||
}
|
||||
|
||||
int32_t OQS_SIG_ml_dsa_44_verify(const uint8_t *message, size_t message_length,
|
||||
const uint8_t *signature,
|
||||
size_t signature_length,
|
||||
const uint8_t *public_key)
|
||||
{
|
||||
(void)message;
|
||||
(void)message_length;
|
||||
(void)signature;
|
||||
(void)signature_length;
|
||||
(void)public_key;
|
||||
return -1;
|
||||
}
|
||||
|
||||
void OQS_MEM_cleanse(void *output, size_t length)
|
||||
{
|
||||
memset(output, 0, length);
|
||||
}
|
||||
|
||||
@@ -115,12 +115,13 @@ with tempfile.TemporaryDirectory(prefix="inbe-daochi-native-") as temporary:
|
||||
str(COMPILER), "--no-main", "--root", str(ROOT / "src"),
|
||||
"--module-path", str(ROOT / "build/packages/ziran/std"),
|
||||
"--module-path", str(ROOT / "build/packages/daochi-client"),
|
||||
"--module-path", str(ROOT / "build/packages/oqs/src"),
|
||||
"-o", str(generated), str(ROOT / "src/storage/daochi_native.zi"),
|
||||
], check=True)
|
||||
sources = [
|
||||
"storage/daochi_native.c", "daochi_account.c", "client.c", "auth.c", "url.c", "wire.c",
|
||||
"sync.c", "transaction.c", "sync_account_sign.c", "sync_crypto.c",
|
||||
"sync_crypto_random.c",
|
||||
"sync_crypto_random.c", "oqs.c",
|
||||
"net_http_curl_linux.c", "json_scan.c", "text.c", "text_buffer.c",
|
||||
"byte_text_linux.c", "c_string.c",
|
||||
]
|
||||
|
||||
@@ -48,14 +48,13 @@ int32_t storage_setting_text_equals(String key, String value)
|
||||
void storage_settings_begin_write(void) {}
|
||||
void storage_settings_end_write(void) {}
|
||||
|
||||
int32_t inbe_oqs_random_bytes(uint8_t *output, uint64_t length)
|
||||
void OQS_randombytes(uint8_t *output, size_t length)
|
||||
{
|
||||
assert(length == 32);
|
||||
memset(output, 0x42, length);
|
||||
return 1;
|
||||
}
|
||||
|
||||
void OQS_MEM_cleanse(void *output, uint64_t length)
|
||||
void OQS_MEM_cleanse(void *output, size_t length)
|
||||
{
|
||||
volatile uint8_t *bytes = output;
|
||||
while (length > 0) {
|
||||
|
||||
@@ -16,12 +16,13 @@ with tempfile.TemporaryDirectory(prefix="inbe-device-key-") as temporary:
|
||||
subprocess.run([
|
||||
str(COMPILER), "--no-main", "--root", str(ROOT / "src"),
|
||||
"--module-path", str(ROOT / "build/packages/ziran/std"),
|
||||
"--module-path", str(ROOT / "build/packages/oqs/src"),
|
||||
"--module-path", str(ROOT / "build/packages/daochi-client"),
|
||||
"--module-path", str(ROOT / "build/packages/kryon/src/ui"),
|
||||
"-o", str(generated), str(ROOT / "src/storage/device_key_store.zi"),
|
||||
], check=True)
|
||||
names = {"device_key_store.c", "device_key.c", "sync_crypto.c",
|
||||
"sync_crypto_random.c", "byte_text_linux.c"}
|
||||
"sync_crypto_random.c", "byte_text_linux.c", "oqs.c"}
|
||||
sources = sorted(str(path) for path in generated.rglob("*.c")
|
||||
if path.name in names)
|
||||
monocypher = ROOT / "build/packages/monocypher/src"
|
||||
|
||||
@@ -9,7 +9,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/device_preferences_link_behavior.zi"
|
||||
mv "$work/c/device_host.c" "$work/c/device_host.c.skip"
|
||||
mkdir -p "$work/c/app"
|
||||
|
||||
@@ -8,13 +8,13 @@ mkdir -p "$work/c"
|
||||
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
"$root/src/screens/elist_screen.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
-o "$work/c" "$root/src/screens/elist_screen.zi"
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -8,12 +8,12 @@ mkdir -p "$work/c"
|
||||
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/app/language_selection.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/c" "$root/src/app/language_selection.zi"
|
||||
"${CC:-cc}" -std=c11 -Wall -Wextra -Werror \
|
||||
|
||||
@@ -8,14 +8,17 @@ mkdir -p "$work/c" "$work/stubs"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
"$root/src/app/music_library.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
-o "$work/c" "$root/src/app/music_library.zi" \
|
||||
"$root/src/app/music_library_host.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
-o "$work/stubs" "$root/tests/music_library_host_stubs.zi"
|
||||
"${CC:-cc}" -std=c11 -DZIRAN_BOUNDS_CHECK -ffunction-sections \
|
||||
-fdata-sections -Wl,--gc-sections \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/tests/fakes" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -7,7 +7,7 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
sh "$root/scripts/run-ziran.sh" "$bin/zi2c" --no-main --root "$root" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
-o "$work/c" "$root/tests/settings_mutation_behavior.zi"
|
||||
|
||||
@@ -9,12 +9,12 @@ trap 'rm -rf "$work"' EXIT HUP INT TERM
|
||||
mkdir -p "$work/c"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_ui.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/c" "$root/src/screens/settings/settings_ui.zi"
|
||||
set -- "$root/tests/settings_ui_link_test.c"
|
||||
@@ -28,12 +28,12 @@ env -u DISPLAY -u WAYLAND_DISPLAY "$work/test"
|
||||
mkdir -p "$work/device"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_device.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/device" "$root/src/screens/settings/settings_device.zi"
|
||||
"${CC:-cc}" -std=c11 -Wno-unused-function \
|
||||
@@ -43,12 +43,12 @@ mkdir -p "$work/device"
|
||||
mkdir -p "$work/breaks"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_breaks.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/breaks" "$root/src/screens/settings/settings_breaks.zi"
|
||||
"${CC:-cc}" -std=c11 -Wno-unused-function -Wno-unused-variable \
|
||||
@@ -58,12 +58,12 @@ mkdir -p "$work/breaks"
|
||||
mkdir -p "$work/notifications"
|
||||
"$bin/zi2zir" --check-only --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
"$root/src/screens/settings/settings_notifications.zi"
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
-o "$work/notifications" \
|
||||
"$root/src/screens/settings/settings_notifications.zi"
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -8,6 +8,7 @@ mkdir -p "$work/generated"
|
||||
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
-o "$work/generated" "$root/src/storage/paths.zi"
|
||||
|
||||
"${CC:-cc}" -std=c11 -O0 -Wall -Wextra -Werror \
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -9,7 +9,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/style_apply_link_behavior.zi"
|
||||
mkdir -p "$work/c/app"
|
||||
cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
|
||||
@@ -9,6 +9,7 @@ mkdir -p "$work/generated"
|
||||
|
||||
"$bin/zi2c" --no-main --root "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/oqs/src" \
|
||||
-o "$work/generated" \
|
||||
"$root/src/storage/sync_crypto.zi" \
|
||||
"$root/src/storage/sync_account_crypto.zi" \
|
||||
@@ -39,6 +40,7 @@ mkdir -p "$work/generated"
|
||||
"$work/generated/storage/sync_crypto_chacha.c" \
|
||||
"$work/generated/storage/sync_account_encrypted.c" \
|
||||
"$work/generated/byte_text_linux.c" \
|
||||
"$work/generated/oqs.c" \
|
||||
"$work/generated/text_buffers.c" \
|
||||
"$liboqs" -lm -lpthread -o "$work/test"
|
||||
|
||||
|
||||
@@ -14,7 +14,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -10,7 +10,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/daochi-client" \
|
||||
|
||||
@@ -11,7 +11,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -17,7 +17,7 @@ mkdir -p "$work/generated"
|
||||
"$ziran" build --target=c --define PLATFORM_DESKTOP --root "$root/tests" \
|
||||
--module-path "$root/src" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kryon/src/backend" \
|
||||
--module-path "$root/build/packages/game2d/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
|
||||
@@ -9,7 +9,7 @@ mkdir -p "$work/c"
|
||||
"$bin/zi2c" --no-main --root "$root/tests" --module-path "$root/src" \
|
||||
--module-path "$root/build/packages/ziran/std" \
|
||||
--module-path "$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
--module-path "$root/build/packages/kss/src" --module-path "$root/build/packages/oqs/src" --module-path "kryon=$root/build/packages/kryon/src/ui" \
|
||||
-o "$work/c" "$root/tests/theme_catalog_link_behavior.zi"
|
||||
mkdir -p "$work/c/app"
|
||||
cp "$work/c/assets.h" "$work/c/app/assets.h"
|
||||
|
||||
@@ -80,6 +80,7 @@ def build_probe(work, compiler, env):
|
||||
"--module-path", "build/packages/kss/src",
|
||||
"--module-path", "kryon=build/packages/kryon/src/ui",
|
||||
"--module-path", "build/packages/ziran/std",
|
||||
"--module-path", "build/packages/oqs/src",
|
||||
"--module-path", "build/packages/daochi-client",
|
||||
"-o", str(output), "tests/update_flow_probe.zi",
|
||||
], cwd=ROOT, check=True, env=env)
|
||||
|
||||
+9
-1
@@ -79,6 +79,14 @@
|
||||
"ref": "master",
|
||||
"url": "https://github.com/kryonlabs/kryon.git"
|
||||
},
|
||||
{
|
||||
"commit": "714f11106347d954e8903e88260d36c3044f9dd1",
|
||||
"dependencies": {"liboqs": "p051fa9c56d0358ad"},
|
||||
"id": "pfbeb8acb0fb12fb8",
|
||||
"name": "Oqs",
|
||||
"ref": "master",
|
||||
"url": "https://github.com/ziranlang/oqs.git"
|
||||
},
|
||||
{
|
||||
"commit": "e1f07e615e9255a513dbb6d66e5e6e9d335ef690",
|
||||
"dependencies": {"kryon": "pe1833b296eb48392"},
|
||||
@@ -89,7 +97,7 @@
|
||||
}
|
||||
],
|
||||
"root": {
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "pe1833b296eb48392", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"dependencies": {"curl": "pc4b263336680098b", "daochi_client": "p5a3be391420a26d3", "game2d": "p8120950c86e3937b", "kryon": "pe1833b296eb48392", "kss": "pfdf70946e0505dfe", "liboqs": "p051fa9c56d0358ad", "monocypher": "pccdfe79ccaafde45", "oqs": "pfbeb8acb0fb12fb8", "rini": "p09fa77e94b0dfc6c", "sqlite": "p151b83a361c86f2d"},
|
||||
"name": "Inbe"
|
||||
},
|
||||
"toolchain": {
|
||||
|
||||
@@ -15,6 +15,10 @@ ref = "master"
|
||||
git = "https://github.com/kryonlabs/kss.git"
|
||||
ref = "master"
|
||||
|
||||
[dependencies.oqs]
|
||||
git = "https://github.com/ziranlang/oqs.git"
|
||||
ref = "master"
|
||||
|
||||
[dependencies.game2d]
|
||||
git = "https://github.com/kryonlabs/game2d.git"
|
||||
ref = "master"
|
||||
|
||||
Reference in new issue
Block a user