From 9f96f4f7117db9d605e88e67c903550e203eb7b8 Mon Sep 17 00:00:00 2001 From: torque Date: Sun, 3 Sep 2023 18:05:46 -0700 Subject: [PATCH] build.zig: update for v3.8.1 --- README.md | 2 +- build.zig | 62 ++++++++----------------------------------------------- 2 files changed, 10 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index fc4ef8f..1034836 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This is a somewhat hacky port of the LibreSSL build system to Zig. It builds Lib Notes: -1. In order for this to work, `.\update.sh` must have first been run to bring in the LibreSSL OpenBSD sources. (Or, if you trust me, you may use the `zig-3.8.0` branch which has the upstream sources committed to the repository, for ease of use with the Zig package manager). +1. In order for this to work, `.\update.sh` must have first been run to bring in the LibreSSL OpenBSD sources. (Or, if you trust me, you may use the `zig-3.8.1` branch which has the upstream sources committed to the repository, for ease of use with the Zig package manager). 2. I don't know if this causes LibreSSL to be compiled in a way that Compromises Its Cryptographic Integrity. Hopefully it is not even possible to do such a thing in the first place. But I am not an expert, and I ain't looking to port the tests. diff --git a/build.zig b/build.zig index 95e55c1..b649d3a 100644 --- a/build.zig +++ b/build.zig @@ -533,7 +533,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "aes/aes_ctr.c", libcrypto_src_prefix ++ "aes/aes_ecb.c", libcrypto_src_prefix ++ "aes/aes_ige.c", - libcrypto_src_prefix ++ "aes/aes_misc.c", libcrypto_src_prefix ++ "aes/aes_ofb.c", libcrypto_src_prefix ++ "aes/aes_wrap.c", libcrypto_src_prefix ++ "asn1/a_bitstr.c", @@ -570,7 +569,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "asn1/p5_pbev2.c", libcrypto_src_prefix ++ "asn1/p8_pkey.c", libcrypto_src_prefix ++ "asn1/t_crl.c", - libcrypto_src_prefix ++ "asn1/t_pkey.c", libcrypto_src_prefix ++ "asn1/t_req.c", libcrypto_src_prefix ++ "asn1/t_spki.c", libcrypto_src_prefix ++ "asn1/t_x509.c", @@ -623,7 +621,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "bio/bss_null.c", libcrypto_src_prefix ++ "bio/bss_sock.c", libcrypto_src_prefix ++ "bn/bn_add.c", - libcrypto_src_prefix ++ "bn/bn_blind.c", libcrypto_src_prefix ++ "bn/bn_bpsw.c", libcrypto_src_prefix ++ "bn/bn_const.c", libcrypto_src_prefix ++ "bn/bn_convert.c", @@ -640,6 +637,8 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "bn/bn_mont.c", libcrypto_src_prefix ++ "bn/bn_mul.c", libcrypto_src_prefix ++ "bn/bn_prime.c", + libcrypto_src_prefix ++ "bn/bn_primitives.c", + libcrypto_src_prefix ++ "bn/bn_print.c", libcrypto_src_prefix ++ "bn/bn_rand.c", libcrypto_src_prefix ++ "bn/bn_recp.c", libcrypto_src_prefix ++ "bn/bn_shift.c", @@ -647,7 +646,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "bn/bn_sqr.c", libcrypto_src_prefix ++ "bn/bn_word.c", libcrypto_src_prefix ++ "buffer/buf_err.c", - libcrypto_src_prefix ++ "buffer/buf_str.c", libcrypto_src_prefix ++ "buffer/buffer.c", libcrypto_src_prefix ++ "bytestring/bs_ber.c", libcrypto_src_prefix ++ "bytestring/bs_cbb.c", @@ -668,7 +666,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "cmac/cmac.c", libcrypto_src_prefix ++ "cms/cms_asn1.c", libcrypto_src_prefix ++ "cms/cms_att.c", - libcrypto_src_prefix ++ "cms/cms_cd.c", libcrypto_src_prefix ++ "cms/cms_dd.c", libcrypto_src_prefix ++ "cms/cms_enc.c", libcrypto_src_prefix ++ "cms/cms_env.c", @@ -680,10 +677,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "cms/cms_pwri.c", libcrypto_src_prefix ++ "cms/cms_sd.c", libcrypto_src_prefix ++ "cms/cms_smime.c", - libcrypto_src_prefix ++ "comp/c_rle.c", - libcrypto_src_prefix ++ "comp/c_zlib.c", - libcrypto_src_prefix ++ "comp/comp_err.c", - libcrypto_src_prefix ++ "comp/comp_lib.c", libcrypto_src_prefix ++ "conf/conf_api.c", libcrypto_src_prefix ++ "conf/conf_def.c", libcrypto_src_prefix ++ "conf/conf_err.c", @@ -743,11 +736,6 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "dsa/dsa_ossl.c", libcrypto_src_prefix ++ "dsa/dsa_pmeth.c", libcrypto_src_prefix ++ "dsa/dsa_prn.c", - libcrypto_src_prefix ++ "dso/dso_dlfcn.c", - libcrypto_src_prefix ++ "dso/dso_err.c", - libcrypto_src_prefix ++ "dso/dso_lib.c", - libcrypto_src_prefix ++ "dso/dso_null.c", - libcrypto_src_prefix ++ "dso/dso_openssl.c", libcrypto_src_prefix ++ "ec/ec_ameth.c", libcrypto_src_prefix ++ "ec/ec_asn1.c", libcrypto_src_prefix ++ "ec/ec_check.c", @@ -766,38 +754,9 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "ec/ecp_oct.c", libcrypto_src_prefix ++ "ec/ecp_smpl.c", libcrypto_src_prefix ++ "ec/ecx_methods.c", - libcrypto_src_prefix ++ "ecdh/ecdh_kdf.c", - libcrypto_src_prefix ++ "ecdh/ech_err.c", - libcrypto_src_prefix ++ "ecdh/ech_key.c", - libcrypto_src_prefix ++ "ecdh/ech_lib.c", - libcrypto_src_prefix ++ "ecdsa/ecs_asn1.c", - libcrypto_src_prefix ++ "ecdsa/ecs_err.c", - libcrypto_src_prefix ++ "ecdsa/ecs_lib.c", - libcrypto_src_prefix ++ "ecdsa/ecs_ossl.c", - libcrypto_src_prefix ++ "engine/eng_all.c", - libcrypto_src_prefix ++ "engine/eng_cnf.c", - libcrypto_src_prefix ++ "engine/eng_ctrl.c", - libcrypto_src_prefix ++ "engine/eng_dyn.c", - libcrypto_src_prefix ++ "engine/eng_err.c", - libcrypto_src_prefix ++ "engine/eng_fat.c", - libcrypto_src_prefix ++ "engine/eng_init.c", - libcrypto_src_prefix ++ "engine/eng_lib.c", - libcrypto_src_prefix ++ "engine/eng_list.c", - libcrypto_src_prefix ++ "engine/eng_openssl.c", - libcrypto_src_prefix ++ "engine/eng_pkey.c", - libcrypto_src_prefix ++ "engine/eng_table.c", - libcrypto_src_prefix ++ "engine/tb_asnmth.c", - libcrypto_src_prefix ++ "engine/tb_cipher.c", - libcrypto_src_prefix ++ "engine/tb_dh.c", - libcrypto_src_prefix ++ "engine/tb_digest.c", - libcrypto_src_prefix ++ "engine/tb_dsa.c", - libcrypto_src_prefix ++ "engine/tb_ecdh.c", - libcrypto_src_prefix ++ "engine/tb_ecdsa.c", - libcrypto_src_prefix ++ "engine/tb_eckey.c", - libcrypto_src_prefix ++ "engine/tb_pkmeth.c", - libcrypto_src_prefix ++ "engine/tb_rand.c", - libcrypto_src_prefix ++ "engine/tb_rsa.c", - libcrypto_src_prefix ++ "engine/tb_store.c", + libcrypto_src_prefix ++ "ecdh/ecdh.c", + libcrypto_src_prefix ++ "ecdsa/ecdsa.c", + libcrypto_src_prefix ++ "engine/engine_stubs.c", libcrypto_src_prefix ++ "err/err.c", libcrypto_src_prefix ++ "err/err_all.c", libcrypto_src_prefix ++ "err/err_prn.c", @@ -885,10 +844,8 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "kdf/kdf_err.c", libcrypto_src_prefix ++ "lhash/lh_stats.c", libcrypto_src_prefix ++ "lhash/lhash.c", - libcrypto_src_prefix ++ "md4/md4_dgst.c", - libcrypto_src_prefix ++ "md4/md4_one.c", - libcrypto_src_prefix ++ "md5/md5_dgst.c", - libcrypto_src_prefix ++ "md5/md5_one.c", + libcrypto_src_prefix ++ "md4/md4.c", + libcrypto_src_prefix ++ "md5/md5.c", libcrypto_src_prefix ++ "modes/cbc128.c", libcrypto_src_prefix ++ "modes/ccm128.c", libcrypto_src_prefix ++ "modes/cfb128.c", @@ -953,12 +910,11 @@ const libcrypto_sources = [_][]const u8{ libcrypto_src_prefix ++ "rc2/rc2_skey.c", libcrypto_src_prefix ++ "rc2/rc2cfb64.c", libcrypto_src_prefix ++ "rc2/rc2ofb64.c", - libcrypto_src_prefix ++ "ripemd/rmd_dgst.c", - libcrypto_src_prefix ++ "ripemd/rmd_one.c", + libcrypto_src_prefix ++ "ripemd/ripemd.c", libcrypto_src_prefix ++ "rsa/rsa_ameth.c", libcrypto_src_prefix ++ "rsa/rsa_asn1.c", + libcrypto_src_prefix ++ "rsa/rsa_blinding.c", libcrypto_src_prefix ++ "rsa/rsa_chk.c", - libcrypto_src_prefix ++ "rsa/rsa_crpt.c", libcrypto_src_prefix ++ "rsa/rsa_eay.c", libcrypto_src_prefix ++ "rsa/rsa_err.c", libcrypto_src_prefix ++ "rsa/rsa_gen.c",