Skip to content

Commit 391fb55

Browse files
committed
openssl v3.6
1 parent 847ae38 commit 391fb55

File tree

260 files changed

+48666
-1638
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

260 files changed

+48666
-1638
lines changed

.github/workflows/zig-embedded.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
with:
21-
submodules: recursive
2221
fetch-depth: 0
2322
- uses: mlugg/setup-zig@v2
23+
with:
24+
version: master
2425
- name: Build Summary ${{ matrix.targets }}
2526
run: zig build --summary all -freference-trace -Dtarget=${{ matrix.targets }}
2627
- name: Build Summary - Zig Package ${{ matrix.targets }}

.github/workflows/zig.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414
with:
15-
submodules: recursive
1615
fetch-depth: 0
1716
- uses: mlugg/setup-zig@v2
1817
with:

build.zig

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ fn libcrypto(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.buil
4444
lib.root_module.addCMacro("OPENSSL_NO_THREAD_POOL", "");
4545
lib.root_module.addCMacro("OPENSSL_NO_STDIO", "");
4646
lib.root_module.addCMacro("OPENSSL_NO_JITTER", "");
47+
lib.root_module.addCMacro("OPENSSLDIR", "\"/usr/local/ssl\"");
4748
lib.root_module.addCMacro("OSSL_PKEY_PARAM_RSA_DERIVE_FROM_PQ", "1");
4849
if (lib.rootModuleTarget().isMinGW())
4950
lib.root_module.addCMacro("NOCRYPT", "1");
@@ -913,7 +914,6 @@ fn libssl(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin
913914
lib.root_module.addCMacro("OPENSSL_NO_KTLS", "");
914915
lib.root_module.addCMacro("OPENSSL_NO_QUIC", "");
915916
lib.root_module.addCMacro("OPENSSL_NO_QLOG", "");
916-
lib.root_module.addCMacro("OSSL_LIBSSL_RECORD_LAYER_PARAM_HS_PADDING", "");
917917
if (lib.rootModuleTarget().isMinGW())
918918
lib.root_module.addCMacro("NOCRYPT", "1");
919919
lib.root_module.addCSourceFiles(.{
@@ -973,7 +973,6 @@ fn libssl(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.builtin
973973
"ssl/ssl_cert_comp.c",
974974
"ssl/ssl_ciph.c",
975975
"ssl/ssl_conf.c",
976-
"ssl/ssl_err.c",
977976
"ssl/ssl_err_legacy.c",
978977
"ssl/ssl_init.c",
979978
// "ssl/ssl_lib.c",
@@ -1028,7 +1027,6 @@ fn libprovider(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bu
10281027
lib.root_module.addCMacro("OPENSSL_NO_KTLS", "");
10291028
lib.root_module.addCMacro("OPENSSL_NO_QUIC", "");
10301029
lib.root_module.addCMacro("OPENSSL_CPUID_OBJ", "");
1031-
lib.root_module.addCMacro("OSSL_RAND_PARAM_GENERATE", "");
10321030
if (lib.rootModuleTarget().os.tag.isDarwin()) {
10331031
// CommonCrypto
10341032
lib.root_module.linkFramework("CoreServices", .{});
@@ -1119,7 +1117,6 @@ fn libprovider(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bu
11191117
"providers/implementations/ciphers/cipher_cast5_hw.c",
11201118
"providers/implementations/ciphers/cipher_chacha20.c",
11211119
"providers/implementations/ciphers/cipher_chacha20_hw.c",
1122-
"providers/implementations/ciphers/cipher_chacha20_poly1305.c",
11231120
"providers/implementations/ciphers/cipher_chacha20_poly1305_hw.c",
11241121
"providers/implementations/ciphers/cipher_cts.c",
11251122
"providers/implementations/ciphers/cipher_des.c",
@@ -1154,7 +1151,6 @@ fn libprovider(b: *std.Build, target: std.Build.ResolvedTarget, optimize: std.bu
11541151
"providers/implementations/ciphers/cipher_tdes_hw.c",
11551152
"providers/implementations/ciphers/cipher_tdes_wrap.c",
11561153
"providers/implementations/ciphers/cipher_tdes_wrap_hw.c",
1157-
"providers/implementations/ciphers/ciphercommon.c",
11581154
"providers/implementations/ciphers/ciphercommon_block.c",
11591155
"providers/implementations/ciphers/ciphercommon_ccm.c",
11601156
"providers/implementations/ciphers/ciphercommon_ccm_hw.c",

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.{
22
.name = .openssl,
3-
.version = "3.5.0",
3+
.version = "3.6.0",
44
.minimum_zig_version = "0.14.0",
55
.fingerprint = 0x773a47f1ef0097c1,
66
.paths = .{

0 commit comments

Comments
 (0)