Skip to content

Commit 3cffdbb

Browse files
justsmthaws-lc-sys-bindings-generator
justsmth
and
aws-lc-sys-bindings-generator
authored
Prepare aws-lc-sys v0.29.0 (#797)
* Minor refactoring s2n-bignum build * Prepare aws-lc-sys v0.29.0 * Symbols from macos-14-xlarge * Symbols from ubuntu-latest * Symbols from macos-13 * Symbols from i686-pc-windows-msvc * Symbols for i686-unknown-linux-gnu * Symbols for aarch64-unknown-linux-musl * Symbols for armv7-unknown-linux-gnueabihf * Symbols for arm-unknown-linux-gnueabi * Symbols for aarch64-unknown-linux-gnu * Symbols for powerpc-unknown-linux-gnu * Symbols for x86_64-unknown-linux-musl * Symbols for powerpc64le-unknown-linux-gnu * Symbols from x86_64-pc-windows-msvc * Symbols from aarch64-pc-windows-msvc * Symbols from x86_64-pc-windows-gnu * Generated headers * Generated bindings from macos-14-xlarge * Generated bindings from ubuntu-latest * Generated bindings from macos-13 * Generated bindings for aarch64-unknown-linux-musl * Generated bindings for i686-unknown-linux-gnu * Generated bindings for aarch64-unknown-linux-gnu * Generated bindings for x86_64-pc-windows-msvc * Generated bindings for aarch64-linux-android * Generated bindings for x86_64-pc-windows-gnu * Generated bindings for i686-pc-windows-msvc * Generated bindings for aarch64-pc-windows-msvc * Collected source files from macos-14-xlarge * Collected source files from ubuntu-latest * Generated bindings for x86_64-unknown-linux-musl * Generated bindings for riscv64gc-unknown-linux-gnu * Collected source files from macos-13 * Collected source files for x86_64-unknown-linux-musl * Collected source files for i686-unknown-linux-gnu * Collected source files for aarch64-unknown-linux-gnu * Collected source files for aarch64-unknown-linux-musl * Collected NASM files * Collected source files for riscv64gc-unknown-linux-gnu * Include zetas.inc; Fix metadata --------- Co-authored-by: aws-lc-sys-bindings-generator <[email protected]>
1 parent 27a1015 commit 3cffdbb

File tree

96 files changed

+35434
-35817
lines changed

Some content is hidden

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

96 files changed

+35434
-35817
lines changed

‎aws-lc-rs/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[package]
22
name = "aws-lc-rs"
33
authors = ["AWS-LibCrypto"]
4-
version = "1.13.0"
4+
version = "1.13.1"
55
# this crate re-exports whatever sys crate that was selected
6-
links = "aws_lc_rs_1_13_0_sys"
6+
links = "aws_lc_rs_1_13_1_sys"
77
edition = "2021"
88
rust-version = "1.63.0"
99
keywords = ["crypto", "cryptography", "security"]
@@ -47,7 +47,7 @@ fips = ["dep:aws-lc-fips-sys"]
4747

4848
[dependencies]
4949
untrusted = { version = "0.7.1", optional = true }
50-
aws-lc-sys = { version = "0.28.0", path = "../aws-lc-sys", optional = true }
50+
aws-lc-sys = { version = "0.29.0", path = "../aws-lc-sys", optional = true }
5151
aws-lc-fips-sys = { version = "0.13.1", path = "../aws-lc-fips-sys", optional = true }
5252
zeroize = "1.7"
5353

‎aws-lc-sys/Cargo.toml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "aws-lc-sys"
33
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."
4-
version = "0.28.2"
5-
links = "aws_lc_0_28_2"
4+
version = "0.29.0"
5+
links = "aws_lc_0_29_0"
66
authors = ["AWS-LC"]
77
edition = "2021"
88
repository = "https://github.com/aws/aws-lc-rs"
@@ -21,6 +21,7 @@ include = [
2121
"/aws-lc/**/*.errordata",
2222
"/aws-lc/**/err_data_generate.go",
2323
"/aws-lc/**/*.lds",
24+
"/aws-lc/**/*.inc",
2425
"!/aws-lc/bindings/**",
2526
"!/aws-lc/docs/**",
2627
"!/aws-lc/fuzz/**",
@@ -72,4 +73,4 @@ bindgen = { version = "0.69.5", optional = true }
7273
bindgen = { version = "0.69.5" }
7374

7475
[package.metadata.aws-lc-sys]
75-
commit-hash = "1e7565c496469d74ab58ea62c08097a01b075a96"
76+
commit-hash = "7d9cbf39f0fbf78ee47a71046c6a231f04b91e8d"

‎aws-lc-sys/aws-lc

Submodule aws-lc updated 859 files

‎aws-lc-sys/builder/cc_builder.rs

+9-22
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod x86_64_unknown_linux_musl;
1717
use crate::{
1818
cargo_env, effective_target, emit_warning, env_var_to_bool, execute_command, get_crate_cflags,
1919
is_no_asm, optional_env_optional_crate_target, out_dir, requested_c_std, set_env_for_target,
20-
target, target_arch, target_env, target_os, target_vendor, CStdRequested, OutputLibType,
20+
target, target_arch, target_env, target_os, CStdRequested, OutputLibType,
2121
};
2222
use std::path::PathBuf;
2323

@@ -341,9 +341,8 @@ impl CcBuilder {
341341
cc_build
342342
}
343343

344-
fn add_all_files(&self, lib: &Library, cc_build: &mut cc::Build) -> Vec<PathBuf> {
344+
fn add_all_files(&self, lib: &Library, cc_build: &mut cc::Build) {
345345
use core::str::FromStr;
346-
cc_build.file(PathBuf::from_str("rust_wrapper.c").unwrap());
347346

348347
// s2n_bignum is compiled separately due to needing extra flags
349348
let mut s2n_bignum_builder = cc_build.clone();
@@ -356,30 +355,21 @@ impl CcBuilder {
356355
.display()
357356
));
358357
s2n_bignum_builder.define("S2N_BN_HIDE_SYMBOLS", "1");
359-
let cc_preprocessor = self.create_builder();
360358
for source in lib.sources {
361359
let source_path = self.manifest_dir.join("aws-lc").join(source);
362360
let is_s2n_bignum = std::path::Path::new(source).starts_with("third_party/s2n-bignum");
363361

364362
if is_s2n_bignum {
365-
let asm_output_path = if target_vendor() == "apple" && target_arch() == "aarch64" {
366-
let asm_output_path = self.out_dir.join(source);
367-
let mut cc_preprocessor = cc_preprocessor.clone();
368-
cc_preprocessor.file(source_path);
369-
let preprocessed_asm = String::from_utf8(cc_preprocessor.expand()).unwrap();
370-
let preprocessed_asm = preprocessed_asm.replace(';', "\n\t");
371-
fs::create_dir_all(asm_output_path.parent().unwrap()).unwrap();
372-
fs::write(asm_output_path.clone(), preprocessed_asm).unwrap();
373-
asm_output_path
374-
} else {
375-
source_path.clone()
376-
};
377-
s2n_bignum_builder.file(asm_output_path);
363+
s2n_bignum_builder.file(source_path);
378364
} else {
379365
cc_build.file(source_path);
380366
}
381367
}
382-
s2n_bignum_builder.compile_intermediates()
368+
let object_files = s2n_bignum_builder.compile_intermediates();
369+
for object in object_files {
370+
cc_build.object(object);
371+
}
372+
cc_build.file(PathBuf::from_str("rust_wrapper.c").unwrap());
383373
}
384374

385375
fn build_library(&self, lib: &Library) {
@@ -389,10 +379,7 @@ impl CcBuilder {
389379
}
390380
self.run_compiler_checks(&mut cc_build);
391381

392-
let object_files = self.add_all_files(lib, &mut cc_build);
393-
for object in object_files {
394-
cc_build.object(object);
395-
}
382+
self.add_all_files(lib, &mut cc_build);
396383
if let Some(prefix) = &self.build_prefix {
397384
cc_build.compile(format!("{}_crypto", prefix.as_str()).as_str());
398385
} else {

‎aws-lc-sys/builder/cc_builder/aarch64_apple_darwin.rs

+62-67
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
22
// SPDX-License-Identifier: Apache-2.0 OR ISC
3-
// Mon Apr 21 14:57:45 UTC 2025
3+
// Wed Apr 30 17:54:08 UTC 2025
44

55
use crate::cc_builder::Library;
66

@@ -261,71 +261,66 @@ pub(super) const CRYPTO_LIBRARY: Library = Library {
261261
"generated-src/ios-aarch64/crypto/fipsmodule/sha512-armv8.S",
262262
"generated-src/ios-aarch64/crypto/fipsmodule/vpaes-armv8.S",
263263
"generated-src/ios-aarch64/crypto/test/trampoline-armv8.S",
264-
"third_party/s2n-bignum/arm/curve25519/bignum_madd_n25519.S",
265-
"third_party/s2n-bignum/arm/curve25519/bignum_madd_n25519_alt.S",
266-
"third_party/s2n-bignum/arm/curve25519/bignum_mod_n25519.S",
267-
"third_party/s2n-bignum/arm/curve25519/bignum_neg_p25519.S",
268-
"third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte.S",
269-
"third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte_alt.S",
270-
"third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte.S",
271-
"third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte_alt.S",
272-
"third_party/s2n-bignum/arm/curve25519/edwards25519_decode.S",
273-
"third_party/s2n-bignum/arm/curve25519/edwards25519_decode_alt.S",
274-
"third_party/s2n-bignum/arm/curve25519/edwards25519_encode.S",
275-
"third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase.S",
276-
"third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase_alt.S",
277-
"third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble.S",
278-
"third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble_alt.S",
279-
"third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n.S",
280-
"third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n_neon.S",
281-
"third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32.S",
282-
"third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32_neon.S",
283-
"third_party/s2n-bignum/arm/fastmul/bignum_kmul_32_64.S",
284-
"third_party/s2n-bignum/arm/fastmul/bignum_kmul_32_64_neon.S",
285-
"third_party/s2n-bignum/arm/fastmul/bignum_ksqr_16_32.S",
286-
"third_party/s2n-bignum/arm/fastmul/bignum_ksqr_16_32_neon.S",
287-
"third_party/s2n-bignum/arm/fastmul/bignum_ksqr_32_64.S",
288-
"third_party/s2n-bignum/arm/fastmul/bignum_ksqr_32_64_neon.S",
289-
"third_party/s2n-bignum/arm/generic/bignum_copy_row_from_table.S",
290-
"third_party/s2n-bignum/arm/generic/bignum_copy_row_from_table_16_neon.S",
291-
"third_party/s2n-bignum/arm/generic/bignum_copy_row_from_table_32_neon.S",
292-
"third_party/s2n-bignum/arm/generic/bignum_copy_row_from_table_8n_neon.S",
293-
"third_party/s2n-bignum/arm/generic/bignum_ge.S",
294-
"third_party/s2n-bignum/arm/generic/bignum_mul.S",
295-
"third_party/s2n-bignum/arm/generic/bignum_optsub.S",
296-
"third_party/s2n-bignum/arm/generic/bignum_sqr.S",
297-
"third_party/s2n-bignum/arm/p256/bignum_montinv_p256.S",
298-
"third_party/s2n-bignum/arm/p256/p256_montjscalarmul.S",
299-
"third_party/s2n-bignum/arm/p256/p256_montjscalarmul_alt.S",
300-
"third_party/s2n-bignum/arm/p384/bignum_add_p384.S",
301-
"third_party/s2n-bignum/arm/p384/bignum_deamont_p384.S",
302-
"third_party/s2n-bignum/arm/p384/bignum_littleendian_6.S",
303-
"third_party/s2n-bignum/arm/p384/bignum_montinv_p384.S",
304-
"third_party/s2n-bignum/arm/p384/bignum_montmul_p384.S",
305-
"third_party/s2n-bignum/arm/p384/bignum_montmul_p384_alt.S",
306-
"third_party/s2n-bignum/arm/p384/bignum_montsqr_p384.S",
307-
"third_party/s2n-bignum/arm/p384/bignum_montsqr_p384_alt.S",
308-
"third_party/s2n-bignum/arm/p384/bignum_neg_p384.S",
309-
"third_party/s2n-bignum/arm/p384/bignum_nonzero_6.S",
310-
"third_party/s2n-bignum/arm/p384/bignum_sub_p384.S",
311-
"third_party/s2n-bignum/arm/p384/bignum_tomont_p384.S",
312-
"third_party/s2n-bignum/arm/p384/p384_montjdouble.S",
313-
"third_party/s2n-bignum/arm/p384/p384_montjdouble_alt.S",
314-
"third_party/s2n-bignum/arm/p384/p384_montjscalarmul.S",
315-
"third_party/s2n-bignum/arm/p384/p384_montjscalarmul_alt.S",
316-
"third_party/s2n-bignum/arm/p521/bignum_add_p521.S",
317-
"third_party/s2n-bignum/arm/p521/bignum_fromlebytes_p521.S",
318-
"third_party/s2n-bignum/arm/p521/bignum_inv_p521.S",
319-
"third_party/s2n-bignum/arm/p521/bignum_mul_p521.S",
320-
"third_party/s2n-bignum/arm/p521/bignum_mul_p521_alt.S",
321-
"third_party/s2n-bignum/arm/p521/bignum_neg_p521.S",
322-
"third_party/s2n-bignum/arm/p521/bignum_sqr_p521.S",
323-
"third_party/s2n-bignum/arm/p521/bignum_sqr_p521_alt.S",
324-
"third_party/s2n-bignum/arm/p521/bignum_sub_p521.S",
325-
"third_party/s2n-bignum/arm/p521/bignum_tolebytes_p521.S",
326-
"third_party/s2n-bignum/arm/p521/p521_jdouble.S",
327-
"third_party/s2n-bignum/arm/p521/p521_jdouble_alt.S",
328-
"third_party/s2n-bignum/arm/p521/p521_jscalarmul.S",
329-
"third_party/s2n-bignum/arm/p521/p521_jscalarmul_alt.S",
264+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/bignum_madd_n25519.S",
265+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/bignum_madd_n25519_alt.S",
266+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/bignum_mod_n25519.S",
267+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/bignum_neg_p25519.S",
268+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/curve25519_x25519_byte.S",
269+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/curve25519_x25519_byte_alt.S",
270+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/curve25519_x25519base_byte.S",
271+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/curve25519_x25519base_byte_alt.S",
272+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_decode.S",
273+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_decode_alt.S",
274+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_encode.S",
275+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_scalarmulbase.S",
276+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_scalarmulbase_alt.S",
277+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_scalarmuldouble.S",
278+
"third_party/s2n-bignum/s2n-bignum-imported/arm/curve25519/edwards25519_scalarmuldouble_alt.S",
279+
"third_party/s2n-bignum/s2n-bignum-imported/arm/fastmul/bignum_emontredc_8n.S",
280+
"third_party/s2n-bignum/s2n-bignum-imported/arm/fastmul/bignum_kmul_16_32.S",
281+
"third_party/s2n-bignum/s2n-bignum-imported/arm/fastmul/bignum_kmul_32_64.S",
282+
"third_party/s2n-bignum/s2n-bignum-imported/arm/fastmul/bignum_ksqr_16_32.S",
283+
"third_party/s2n-bignum/s2n-bignum-imported/arm/fastmul/bignum_ksqr_32_64.S",
284+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_copy_row_from_table.S",
285+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_copy_row_from_table_16.S",
286+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_copy_row_from_table_32.S",
287+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_copy_row_from_table_8n.S",
288+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_ge.S",
289+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_mul.S",
290+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_optsub.S",
291+
"third_party/s2n-bignum/s2n-bignum-imported/arm/generic/bignum_sqr.S",
292+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p256/bignum_montinv_p256.S",
293+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p256/p256_montjscalarmul.S",
294+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p256/p256_montjscalarmul_alt.S",
295+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_add_p384.S",
296+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_deamont_p384.S",
297+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_littleendian_6.S",
298+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_montinv_p384.S",
299+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_montmul_p384.S",
300+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_montmul_p384_alt.S",
301+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_montsqr_p384.S",
302+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_montsqr_p384_alt.S",
303+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_neg_p384.S",
304+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_nonzero_6.S",
305+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_sub_p384.S",
306+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/bignum_tomont_p384.S",
307+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/p384_montjdouble.S",
308+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/p384_montjdouble_alt.S",
309+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/p384_montjscalarmul.S",
310+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p384/p384_montjscalarmul_alt.S",
311+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_add_p521.S",
312+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_fromlebytes_p521.S",
313+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_inv_p521.S",
314+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_mul_p521.S",
315+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_mul_p521_alt.S",
316+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_neg_p521.S",
317+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_sqr_p521.S",
318+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_sqr_p521_alt.S",
319+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_sub_p521.S",
320+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/bignum_tolebytes_p521.S",
321+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/p521_jdouble.S",
322+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/p521_jdouble_alt.S",
323+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/p521_jscalarmul.S",
324+
"third_party/s2n-bignum/s2n-bignum-imported/arm/p521/p521_jscalarmul_alt.S",
330325
],
331326
};

0 commit comments

Comments
 (0)