Pregenerate bindings for aarch64-linux-android

.github/workflows/cross.yml

@@ -27,23 +27,23 @@ jobs:
       fail-fast: false
       matrix:
         target:
-          - [aarch64-linux-android, 0]
-          - [aarch64-unknown-linux-gnu, 1]
-          - [aarch64-unknown-linux-musl, 1]
-          - [arm-linux-androideabi, 0]
-          - [arm-unknown-linux-gnueabihf, 0]
-          - [arm-unknown-linux-musleabi, 1]
-          - [arm-unknown-linux-musleabihf, 1]
-          - [armv7-linux-androideabi, 0]
-          - [armv7-unknown-linux-gnueabihf, 0]
-          - [i686-unknown-linux-gnu, 0]
-          - [powerpc-unknown-linux-gnu, 1]
-          - [powerpc64-unknown-linux-gnu, 1]
-          - [powerpc64le-unknown-linux-gnu, 1]
-          - [riscv64gc-unknown-linux-gnu, 0]
-          - [s390x-unknown-linux-gnu, 0]
-          - [x86_64-pc-windows-gnu, 0]
-          - [x86_64-unknown-linux-musl, 0]
+          - [ aarch64-linux-android, 0, 1 ]
+          - [ aarch64-unknown-linux-gnu, 1, 1 ]
+          - [ aarch64-unknown-linux-musl, 1, 1 ]
+          - [ arm-linux-androideabi, 0, 0 ]
+          - [ arm-unknown-linux-gnueabihf, 0, 0 ]
+          - [ arm-unknown-linux-musleabi, 1, 0 ]
+          - [ arm-unknown-linux-musleabihf, 1, 0 ]
+          - [ armv7-linux-androideabi, 0, 0 ]
+          - [ armv7-unknown-linux-gnueabihf, 0, 0 ]
+          - [ i686-unknown-linux-gnu, 0, 1 ]
+          - [ powerpc-unknown-linux-gnu, 1, 0 ]
+          - [ powerpc64-unknown-linux-gnu, 1, 0 ]
+          - [ powerpc64le-unknown-linux-gnu, 1, 0 ]
+          - [ riscv64gc-unknown-linux-gnu, 0, 0 ]
+          - [ s390x-unknown-linux-gnu, 0, 0 ]
+          - [ x86_64-pc-windows-gnu, 0, 1 ]
+          - [ x86_64-unknown-linux-musl, 0, 1 ]
     steps:
       - uses: actions/checkout@v3
         with:
@@ -70,6 +70,9 @@ jobs:
       - if: ${{ !startsWith(matrix.target[0], 'x86_64') }}
         run: |
           echo 'AWS_LC_RS_DISABLE_SLOW_TESTS=1' >> "$GITHUB_ENV"
+      - if: ${{ matrix.target[2] == 1 }}
+        run: |
+          echo 'AWS_LC_SYS_EXTERNAL_BINDGEN=0' >> "$GITHUB_ENV"
       - name: Cross-compilation (test release)
         run: cross test -p aws-lc-rs --release --features unstable --target ${{ matrix.target[0] }}
       - if: ${{ matrix.target[1] == 1 }}
@@ -259,7 +262,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [13.4, 14.1]
+        target: [ 13.4, 14.1 ]
     steps:
       - uses: actions/checkout@v4
         with:

.github/workflows/sys-bindings-generator.yml

@@ -215,7 +215,12 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        target: [ aarch64-unknown-linux-gnu, i686-unknown-linux-gnu, aarch64-unknown-linux-musl, x86_64-unknown-linux-musl ]
+        target:
+          - "aarch64-linux-android"
+          - "aarch64-unknown-linux-gnu"
+          - "i686-unknown-linux-gnu"
+          - "aarch64-unknown-linux-musl"
+          - "x86_64-unknown-linux-musl"
     steps:
       - uses: actions/checkout@v4
         with:
@@ -256,6 +261,8 @@ jobs:
     needs: generate-cross-bindings-and-commit
     if: github.repository == 'aws/aws-lc-rs'
     runs-on: ubuntu-latest
+    env:
+      AWS_LC_RS_DISABLE_SLOW_TESTS: 1
     strategy:
       fail-fast: false
       matrix:

aws-lc-sys/Cargo.toml

@@ -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.24.1"
-links = "aws_lc_0_24_1"
+version = "0.24.2"
+links = "aws_lc_0_24_2"
 authors = ["AWS-LC"]
 edition = "2021"
 repository = "https://github.com/aws/aws-lc-rs"

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:02:00 UTC 2024
+// Fri Jan  3 18:30:11 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:05:56 UTC 2024
+// Fri Jan  3 18:32:51 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:06:03 UTC 2024
+// Fri Jan  3 18:33:13 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:05:53 UTC 2024
+// Fri Jan  3 18:32:19 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:03:18 UTC 2024
+// Fri Jan  3 18:32:26 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:01:55 UTC 2024
+// Fri Jan  3 18:29:49 UTC 2025
 
 use crate::cc_builder::Library;
 

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

@@ -1,6 +1,6 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-// Mon Dec 30 19:05:54 UTC 2024
+// Fri Jan  3 18:32:36 UTC 2025
 
 use crate::cc_builder::Library;
 

aws-lc-sys/builder/main.rs

@@ -279,7 +279,7 @@ fn generate_src_bindings(manifest_dir: &Path, prefix: &Option<String>, src_bindi
             ..Default::default()
         },
     )
-    .write_to_file(src_bindings_path.join(format!("{}.rs", target_platform_prefix("crypto"))))
+    .write_to_file(src_bindings_path)
     .expect("write bindings");
 }
 
@@ -430,6 +430,7 @@ fn initialize() {
         let target = target();
         let supported_platform = match target.as_str() {
             "aarch64-apple-darwin"
+            | "aarch64-linux-android"
             | "aarch64-pc-windows-msvc"
             | "aarch64-unknown-linux-gnu"
             | "aarch64-unknown-linux-musl"
@@ -521,6 +522,7 @@ fn test_nasm_command() -> bool {
 fn prepare_cargo_cfg() {
     if cfg!(clippy) {
         println!("cargo:rustc-check-cfg=cfg(use_bindgen_generated)");
+        println!("cargo:rustc-check-cfg=cfg(aarch64_linux_android)");
         println!("cargo:rustc-check-cfg=cfg(aarch64_apple_darwin)");
         println!("cargo:rustc-check-cfg=cfg(aarch64_pc_windows_msvc)");
         println!("cargo:rustc-check-cfg=cfg(aarch64_unknown_linux_gnu)");
@@ -588,12 +590,14 @@ fn main() {
     if is_pregenerating_bindings() {
         #[cfg(feature = "bindgen")]
         {
-            emit_warning(&format!(
-                "Generating src bindings. Platform: '{}' Prefix: '{prefix:?}'",
-                target()
-            ));
-            let src_bindings_path = Path::new(&manifest_dir).join("src");
-            generate_src_bindings(&manifest_dir, &prefix, &src_bindings_path);
+            let src_bindings_path = Path::new(&manifest_dir)
+                .join("src")
+                .join(format!("{}.rs", target_platform_prefix("crypto")));
+            if is_external_bindgen() {
+                invoke_external_bindgen(&manifest_dir, &prefix, &src_bindings_path).unwrap();
+            } else {
+                generate_src_bindings(&manifest_dir, &prefix, &src_bindings_path);
+            }
             bindings_available = true;
         }
     } else if is_bindgen_required() {
@@ -603,10 +607,6 @@ fn main() {
     }
 
     if !bindings_available && !cfg!(feature = "ssl") {
-        emit_warning(&format!(
-            "Generating bindings - external bindgen. Platform: {}",
-            target()
-        ));
         let gen_bindings_path = out_dir().join("bindings.rs");
         let result = invoke_external_bindgen(&manifest_dir, &prefix, &gen_bindings_path);
         match result {
@@ -749,6 +749,11 @@ fn invoke_external_bindgen(
 ) -> Result<(), String> {
     verify_bindgen()?;
 
+    emit_warning(&format!(
+        "Generating bindings - external bindgen. Platform: {}",
+        target()
+    ));
+
     let options = BindingOptions {
         // We collect the symbols w/o the prefix added
         build_prefix: None,

aws-lc-sys/builder/prebuilt-nasm/aes128gcmsiv-x86_64-disasm.txt

@@ -31,7 +31,7 @@ GFMUL:
   000000000000005D: 90                 nop
   000000000000005E: 90                 nop
   000000000000005F: 90                 nop
-aws_lc_0_24_1_aesgcmsiv_htable_init:
+aws_lc_0_24_2_aesgcmsiv_htable_init:
   0000000000000060: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000065: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000006A: 48 89 E0           mov         rax,rsp
@@ -74,7 +74,7 @@ L$SEH_end_aesgcmsiv_htable_init:
   00000000000000DD: 90                 nop
   00000000000000DE: 90                 nop
   00000000000000DF: 90                 nop
-aws_lc_0_24_1_aesgcmsiv_htable6_init:
+aws_lc_0_24_2_aesgcmsiv_htable6_init:
   00000000000000E0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   00000000000000E5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   00000000000000EA: 48 89 E0           mov         rax,rsp
@@ -101,7 +101,7 @@ L$SEH_end_aesgcmsiv_htable6_init:
   000000000000013D: 90                 nop
   000000000000013E: 90                 nop
   000000000000013F: 90                 nop
-aws_lc_0_24_1_aesgcmsiv_htable_polyval:
+aws_lc_0_24_2_aesgcmsiv_htable_polyval:
   0000000000000140: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000145: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000014A: 48 89 E0           mov         rax,rsp
@@ -401,7 +401,7 @@ L$SEH_end_aesgcmsiv_htable_polyval:
   000000000000049D: 90                 nop
   000000000000049E: 90                 nop
   000000000000049F: 90                 nop
-aws_lc_0_24_1_aesgcmsiv_polyval_horner:
+aws_lc_0_24_2_aesgcmsiv_polyval_horner:
   00000000000004A0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   00000000000004A5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   00000000000004AA: 48 89 E0           mov         rax,rsp
@@ -442,7 +442,7 @@ L$SEH_end_aesgcmsiv_polyval_horner:
   000000000000050D: 90                 nop
   000000000000050E: 90                 nop
   000000000000050F: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_aes_ks:
+aws_lc_0_24_2_aes128gcmsiv_aes_ks:
   0000000000000510: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000515: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000051A: 48 89 E0           mov         rax,rsp
@@ -509,7 +509,7 @@ L$SEH_end_aes128gcmsiv_aes_ks:
   00000000000005FD: 90                 nop
   00000000000005FE: 90                 nop
   00000000000005FF: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_aes_ks:
+aws_lc_0_24_2_aes256gcmsiv_aes_ks:
   0000000000000600: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000605: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000060A: 48 89 E0           mov         rax,rsp
@@ -569,7 +569,7 @@ L$ks256_loop:
   00000000000006DD: 90                 nop
   00000000000006DE: 90                 nop
   00000000000006DF: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_aes_ks_enc_x1:
+aws_lc_0_24_2_aes128gcmsiv_aes_ks_enc_x1:
   00000000000006E0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   00000000000006E5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   00000000000006EA: 48 89 E0           mov         rax,rsp
@@ -718,7 +718,7 @@ L$SEH_end_aes128gcmsiv_aes_ks_enc_x1:
   000000000000093D: 90                 nop
   000000000000093E: 90                 nop
   000000000000093F: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_kdf:
+aws_lc_0_24_2_aes128gcmsiv_kdf:
   0000000000000940: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000945: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000094A: 48 89 E0           mov         rax,rsp
@@ -808,7 +808,7 @@ L$SEH_end_aes128gcmsiv_kdf:
   0000000000000ABD: 90                 nop
   0000000000000ABE: 90                 nop
   0000000000000ABF: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_enc_msg_x4:
+aws_lc_0_24_2_aes128gcmsiv_enc_msg_x4:
   0000000000000AC0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000AC5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000000ACA: 48 89 E0           mov         rax,rsp
@@ -971,7 +971,7 @@ L$SEH_end_aes128gcmsiv_enc_msg_x4:
   0000000000000D4D: 90                 nop
   0000000000000D4E: 90                 nop
   0000000000000D4F: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_enc_msg_x8:
+aws_lc_0_24_2_aes128gcmsiv_enc_msg_x8:
   0000000000000D50: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000000D55: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000000D5A: 48 89 E0           mov         rax,rsp
@@ -1224,7 +1224,7 @@ L$SEH_end_aes128gcmsiv_enc_msg_x8:
   000000000000116D: 90                 nop
   000000000000116E: 90                 nop
   000000000000116F: 90                 nop
-aws_lc_0_24_1_aes128gcmsiv_dec:
+aws_lc_0_24_2_aes128gcmsiv_dec:
   0000000000001170: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000001175: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000117A: 48 89 E0           mov         rax,rsp
@@ -1684,7 +1684,7 @@ L$128_dec_out:
   0000000000001994: 48 8B 7C 24 08     mov         rdi,qword ptr [rsp+8]
   0000000000001999: 48 8B 74 24 10     mov         rsi,qword ptr [rsp+10h]
   000000000000199E: F3 C3              rep ret
-aws_lc_0_24_1_aes128gcmsiv_ecb_enc_block:
+aws_lc_0_24_2_aes128gcmsiv_ecb_enc_block:
   00000000000019A0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   00000000000019A5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   00000000000019AA: 48 89 E0           mov         rax,rsp
@@ -1725,7 +1725,7 @@ L$SEH_end_aes128gcmsiv_ecb_enc_block:
   0000000000001A1D: 90                 nop
   0000000000001A1E: 90                 nop
   0000000000001A1F: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_aes_ks_enc_x1:
+aws_lc_0_24_2_aes256gcmsiv_aes_ks_enc_x1:
   0000000000001A20: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000001A25: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000001A2A: 48 89 E0           mov         rax,rsp
@@ -1916,7 +1916,7 @@ L$SEH_end_aes256gcmsiv_aes_ks_enc_x1:
   0000000000001D4D: 90                 nop
   0000000000001D4E: 90                 nop
   0000000000001D4F: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_ecb_enc_block:
+aws_lc_0_24_2_aes256gcmsiv_ecb_enc_block:
   0000000000001D50: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000001D55: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000001D5A: 48 89 E0           mov         rax,rsp
@@ -1961,7 +1961,7 @@ L$SEH_end_aes256gcmsiv_ecb_enc_block:
   0000000000001DED: 90                 nop
   0000000000001DEE: 90                 nop
   0000000000001DEF: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_enc_msg_x4:
+aws_lc_0_24_2_aes256gcmsiv_enc_msg_x4:
   0000000000001DF0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000001DF5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000001DFA: 48 89 E0           mov         rax,rsp
@@ -2160,7 +2160,7 @@ L$SEH_end_aes256gcmsiv_enc_msg_x4:
   000000000000211D: 90                 nop
   000000000000211E: 90                 nop
   000000000000211F: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_enc_msg_x8:
+aws_lc_0_24_2_aes256gcmsiv_enc_msg_x8:
   0000000000002120: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000002125: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000212A: 48 89 E0           mov         rax,rsp
@@ -2451,7 +2451,7 @@ L$SEH_end_aes256gcmsiv_enc_msg_x8:
   000000000000261D: 90                 nop
   000000000000261E: 90                 nop
   000000000000261F: 90                 nop
-aws_lc_0_24_1_aes256gcmsiv_dec:
+aws_lc_0_24_2_aes256gcmsiv_dec:
   0000000000002620: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000002625: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   000000000000262A: 48 89 E0           mov         rax,rsp
@@ -2971,7 +2971,7 @@ L$256_dec_out:
   0000000000002F94: 48 8B 7C 24 08     mov         rdi,qword ptr [rsp+8]
   0000000000002F99: 48 8B 74 24 10     mov         rsi,qword ptr [rsp+10h]
   0000000000002F9E: F3 C3              rep ret
-aws_lc_0_24_1_aes256gcmsiv_kdf:
+aws_lc_0_24_2_aes256gcmsiv_kdf:
   0000000000002FA0: 48 89 7C 24 08     mov         qword ptr [rsp+8],rdi
   0000000000002FA5: 48 89 74 24 10     mov         qword ptr [rsp+10h],rsi
   0000000000002FAA: 48 89 E0           mov         rax,rsp

aws-lc-sys/builder/prebuilt-nasm/aesni-gcm-avx512-disasm.txt

@@ -5,7 +5,7 @@ Dump of file aesni-gcm-avx512.obj
 
 File Type: COFF OBJECT
 
-aws_lc_0_24_1_gcm_ghash_avx512:
+aws_lc_0_24_2_gcm_ghash_avx512:
   0000000000000000: 0F 0B              ud2
   0000000000000002: F3 C3              rep ret