Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update aws-lc-sys/aws-lc to v1.38.0 #578

Closed
wants to merge 38 commits into from
Closed

Update aws-lc-sys/aws-lc to v1.38.0 #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
9aeaa4e
Output OSSL_CONF_DEFINES config options
skmcgrail Oct 31, 2024
a912f64
Add openssl/ocsp.h for generation
skmcgrail Nov 1, 2024
7fd1287
Update aws-lc-sys to v1.38.0
skmcgrail Nov 7, 2024
b41d940
Symbols for aarch64-unknown-linux-musl
Nov 7, 2024
a696603
Symbols for aarch64-unknown-linux-gnu
Nov 7, 2024
52c975d
Symbols for powerpc64le-unknown-linux-gnu
Nov 7, 2024
fc9cffe
Symbols from x86_64-pc-windows-msvc
Nov 7, 2024
b75dc5a
Symbols from ubuntu-latest
Nov 7, 2024
82ec85c
Symbols for armv7-unknown-linux-gnueabihf
Nov 7, 2024
c13682b
Symbols for arm-unknown-linux-gnueabi
Nov 7, 2024
08286c2
Symbols for i686-unknown-linux-gnu
Nov 7, 2024
b3968fa
Symbols from macos-14-xlarge
Nov 7, 2024
93a5c65
Symbols from x86_64-pc-windows-gnu
Nov 7, 2024
cfb4876
Symbols from aarch64-pc-windows-msvc
Nov 7, 2024
d8fecdd
Symbols for x86_64-unknown-linux-musl
Nov 7, 2024
db2ab8d
Symbols for powerpc-unknown-linux-gnu
Nov 7, 2024
d1c6cdf
Symbols from macos-13
Nov 7, 2024
159b67f
Symbols from i686-pc-windows-msvc
Nov 7, 2024
1e1661c
Generated headers
Nov 7, 2024
2116c46
Generated bindings from ubuntu-latest
Nov 7, 2024
86f3218
Generated bindings from macos-14-xlarge
Nov 7, 2024
ef40540
Generated bindings for x86_64-pc-windows-msvc
Nov 7, 2024
79d6668
Generated bindings from macos-13
Nov 7, 2024
65674dd
Generated bindings for aarch64-unknown-linux-gnu
Nov 7, 2024
dad5a44
Generated bindings for i686-unknown-linux-gnu
Nov 7, 2024
beec98c
Generated bindings for aarch64-unknown-linux-musl
Nov 7, 2024
54ec26d
Generated bindings for i686-pc-windows-msvc
Nov 7, 2024
c150639
Generated bindings for x86_64-unknown-linux-musl
Nov 7, 2024
66f54f7
Generated bindings for x86_64-pc-windows-gnu
Nov 7, 2024
e6e6b24
Generated bindings for aarch64-pc-windows-msvc
Nov 7, 2024
ba85abc
Collected source files from ubuntu-latest
Nov 7, 2024
55b01d3
Collected source files from macos-14-xlarge
Nov 7, 2024
75dfae5
Collected source files from macos-13
Nov 7, 2024
2285f90
Collected source files for x86_64-unknown-linux-musl
Nov 7, 2024
d2b4a45
Collected source files for i686-unknown-linux-gnu
Nov 7, 2024
4b71cc4
Collected source files for aarch64-unknown-linux-gnu
Nov 7, 2024
d7ba70e
Collected source files for aarch64-unknown-linux-musl
Nov 7, 2024
f39485d
Collected NASM files
Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 53 additions & 0 deletions aws-lc-fips-sys/builder/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,57 @@ use std::process::Command;

use cmake_builder::CmakeBuilder;

// These should generally match those found in aws-lc/include/openssl/opensslconf.h
const OSSL_CONF_DEFINES: &[&str] = &[
"OPENSSL_NO_ASYNC",
"OPENSSL_NO_BF",
"OPENSSL_NO_BLAKE2",
"OPENSSL_NO_BUF_FREELISTS",
"OPENSSL_NO_CAMELLIA",
"OPENSSL_NO_CAPIENG",
"OPENSSL_NO_CAST",
"OPENSSL_NO_CMS",
"OPENSSL_NO_COMP",
"OPENSSL_NO_CT",
"OPENSSL_NO_DANE",
"OPENSSL_NO_DEPRECATED",
"OPENSSL_NO_DGRAM",
"OPENSSL_NO_DYNAMIC_ENGINE",
"OPENSSL_NO_EC_NISTP_64_GCC_128",
"OPENSSL_NO_EC2M",
"OPENSSL_NO_EGD",
"OPENSSL_NO_ENGINE",
"OPENSSL_NO_GMP",
"OPENSSL_NO_GOST",
"OPENSSL_NO_HEARTBEATS",
"OPENSSL_NO_HW",
"OPENSSL_NO_IDEA",
"OPENSSL_NO_JPAKE",
"OPENSSL_NO_KRB5",
"OPENSSL_NO_MD2",
"OPENSSL_NO_MDC2",
"OPENSSL_NO_OCB",
"OPENSSL_NO_OCSP",
"OPENSSL_NO_RC2",
"OPENSSL_NO_RC5",
"OPENSSL_NO_RFC3779",
"OPENSSL_NO_RIPEMD",
"OPENSSL_NO_RMD160",
"OPENSSL_NO_SCTP",
"OPENSSL_NO_SEED",
"OPENSSL_NO_SM2",
"OPENSSL_NO_SM3",
"OPENSSL_NO_SM4",
"OPENSSL_NO_SRP",
"OPENSSL_NO_SSL_TRACE",
"OPENSSL_NO_SSL2",
"OPENSSL_NO_SSL3",
"OPENSSL_NO_SSL3_METHOD",
"OPENSSL_NO_STATIC_ENGINE",
"OPENSSL_NO_STORE",
"OPENSSL_NO_WHIRLPOOL",
];

macro_rules! bindgen_available {
($top:ident, $item:item) => {
#[allow(clippy::non_minimal_cfg)]
Expand Down Expand Up @@ -476,6 +527,8 @@ fn main() {
println!("cargo:libssl={}_ssl", prefix_string());
}

println!("cargo:conf={}", OSSL_CONF_DEFINES.join(","));

println!("cargo:rerun-if-changed=builder/");
println!("cargo:rerun-if-changed=aws-lc/");
}
Expand Down
2 changes: 1 addition & 1 deletion aws-lc-rs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ fips = ["dep:aws-lc-fips-sys"]

[dependencies]
untrusted = { version = "0.7.1", optional = true }
aws-lc-sys = { version = "0.22.0", path = "../aws-lc-sys", optional = true }
aws-lc-sys = { version = "0.23.0", path = "../aws-lc-sys", optional = true }
aws-lc-fips-sys = { version = "0.12.0", path = "../aws-lc-fips-sys", optional = true }
zeroize = "1.7"
mirai-annotations = "1.12.0"
Expand Down
6 changes: 3 additions & 3 deletions aws-lc-sys/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[package]
name = "aws-lc-sys"
description = "AWS-LC is a general-purpose cryptographic library maintained by the AWS Cryptography team for AWS and their customers. It іs based on code from the Google BoringSSL project and the OpenSSL project."
version = "0.22.0"
links = "aws_lc_0_22_0"
version = "0.23.0"
links = "aws_lc_0_23_0"
authors = ["AWS-LC"]
edition = "2021"
repository = "https://github.com/aws/aws-lc-rs"
Expand Down Expand Up @@ -70,4 +70,4 @@ libc = "0.2.121"
paste = "1.0.11"

[package.metadata.aws-lc-sys]
commit-hash = "8b2ebfcf3fc8b0656f1f4161166484a70238aeaa"
commit-hash = "2d07d3903d5d0dbe5a135314bbbdab6e0e65cbf1"
2 changes: 1 addition & 1 deletion aws-lc-sys/aws-lc
Open in desktop
Submodule aws-lc updated 169 files
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/aarch64_apple_darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:02:34 UTC 2024
// Thu Nov 7 21:51:00 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -143,6 +143,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/aarch64_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:08:31 UTC 2024
// Thu Nov 7 21:54:06 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -144,6 +144,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/aarch64_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:07:57 UTC 2024
// Thu Nov 7 21:54:32 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -144,6 +144,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/i686_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:07:54 UTC 2024
// Thu Nov 7 21:54:05 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -144,6 +144,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/x86_64_apple_darwin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:05:23 UTC 2024
// Thu Nov 7 21:52:04 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -143,6 +143,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/x86_64_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:02:08 UTC 2024
// Thu Nov 7 21:50:53 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -145,6 +145,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
4 changes: 3 additions & 1 deletion aws-lc-sys/builder/cc_builder/x86_64_unknown_linux_musl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: Apache-2.0 OR ISC
// Thu Oct 3 17:07:39 UTC 2024
// Thu Nov 7 21:54:23 UTC 2024

use crate::cc_builder::Library;

Expand Down Expand Up @@ -145,6 +145,8 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
"crypto/pem/pem_pkey.c",
"crypto/pem/pem_x509.c",
"crypto/pem/pem_xaux.c",
"crypto/pkcs7/bio/cipher.c",
"crypto/pkcs7/bio/md.c",
"crypto/pkcs7/pkcs7.c",
"crypto/pkcs7/pkcs7_asn1.c",
"crypto/pkcs7/pkcs7_x509.c",
Expand Down
54 changes: 54 additions & 0 deletions aws-lc-sys/builder/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,58 @@ use std::{env, fmt, fmt::Debug};
use cc_builder::CcBuilder;
use cmake_builder::CmakeBuilder;

// These should generally match those found in aws-lc/include/openssl/opensslconf.h
const OSSL_CONF_DEFINES: &[&str] = &[
"OPENSSL_NO_ASYNC",
"OPENSSL_NO_BF",
"OPENSSL_NO_BLAKE2",
"OPENSSL_NO_BUF_FREELISTS",
"OPENSSL_NO_CAMELLIA",
"OPENSSL_NO_CAPIENG",
"OPENSSL_NO_CAST",
"OPENSSL_NO_CMS",
"OPENSSL_NO_COMP",
"OPENSSL_NO_CRYPTO_MDEBUG",
"OPENSSL_NO_CT",
"OPENSSL_NO_DANE",
"OPENSSL_NO_DEPRECATED",
"OPENSSL_NO_DGRAM",
"OPENSSL_NO_DYNAMIC_ENGINE",
"OPENSSL_NO_EC_NISTP_64_GCC_128",
"OPENSSL_NO_EC2M",
"OPENSSL_NO_EGD",
"OPENSSL_NO_ENGINE",
"OPENSSL_NO_GMP",
"OPENSSL_NO_GOST",
"OPENSSL_NO_HEARTBEATS",
"OPENSSL_NO_HW",
"OPENSSL_NO_IDEA",
"OPENSSL_NO_JPAKE",
"OPENSSL_NO_KRB5",
"OPENSSL_NO_MD2",
"OPENSSL_NO_MDC2",
"OPENSSL_NO_OCB",
"OPENSSL_NO_RC2",
"OPENSSL_NO_RC5",
"OPENSSL_NO_RFC3779",
"OPENSSL_NO_RIPEMD",
"OPENSSL_NO_RMD160",
"OPENSSL_NO_SCTP",
"OPENSSL_NO_SEED",
"OPENSSL_NO_SM2",
"OPENSSL_NO_SM3",
"OPENSSL_NO_SM4",
"OPENSSL_NO_SRP",
"OPENSSL_NO_SSL_TRACE",
"OPENSSL_NO_SSL2",
"OPENSSL_NO_SSL3",
"OPENSSL_NO_SSL3_METHOD",
"OPENSSL_NO_STATIC_ENGINE",
"OPENSSL_NO_STORE",
"OPENSSL_NO_TS",
"OPENSSL_NO_WHIRLPOOL",
];

macro_rules! bindgen_available {
($top:ident, $item:item) => {
#[allow(clippy::non_minimal_cfg)]
Expand Down Expand Up @@ -581,6 +633,8 @@ fn main() {
println!("cargo:libssl={}_ssl", prefix_string());
}

println!("cargo:conf={}", OSSL_CONF_DEFINES.join(","));

println!("cargo:rerun-if-changed=builder/");
println!("cargo:rerun-if-changed=aws-lc/");
}
Expand Down
Loading
Loading