Updated aws-lc to v1.16.0, regenerated aws-lc-sys

aws-lc-fips-sys/builder/bindgen.rs

@@ -62,12 +62,12 @@ fn prepare_clang_args(manifest_dir: &Path, build_prefix: Option<&str>) -> Vec<St
     clang_args
 }
 
-const COPYRIGHT: &str = r#"
+const COPYRIGHT: &str = r"
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-"#;
+";
 
-const PRELUDE: &str = r#"
+const PRELUDE: &str = r"
 #![allow(
     unused_imports,
     non_camel_case_types,
@@ -86,7 +86,7 @@ const PRELUDE: &str = r#"
     clippy::used_underscore_binding,
     clippy::useless_transmute
 )]
-"#;
+";
 
 #[derive(Default)]
 pub(crate) struct BindingOptions<'a> {

aws-lc-rs/Cargo.toml

@@ -38,7 +38,7 @@ fips = ["dep:aws-lc-fips-sys"]
 
 [dependencies]
 untrusted = { version = "0.7.1", optional = true }
-aws-lc-sys = { version = "0.10.0", path = "../aws-lc-sys", optional = true }
+aws-lc-sys = { version = "0.11.0", path = "../aws-lc-sys", optional = true }
 aws-lc-fips-sys = { version = "0.10.0", path = "../aws-lc-fips-sys", optional = true }
 zeroize = "1"
 mirai-annotations = "1.12.0"

aws-lc-rs/src/ec.rs

@@ -447,10 +447,10 @@ mod tests {
     #[test]
     fn test_from_pkcs8() {
         let input = from_dirty_hex(
-            r#"308187020100301306072a8648ce3d020106082a8648ce3d030107046d306b0201010420090460075f15d
+            r"308187020100301306072a8648ce3d020106082a8648ce3d030107046d306b0201010420090460075f15d
             2a256248000fb02d83ad77593dde4ae59fc5e96142dffb2bd07a14403420004cf0d13a3a7577231ea1b66cf4
             021cd54f21f4ac4f5f2fdd28e05bc7d2bd099d1374cd08d2ef654d6f04498db462f73e0282058dd661a4c9b0
-            437af3f7af6e724"#,
+            437af3f7af6e724",
         );
 
         let result = EcdsaKeyPair::from_pkcs8(&ECDSA_P256_SHA256_FIXED_SIGNING, &input);
@@ -471,12 +471,12 @@ mod tests {
         let alg = &signature::ECDSA_P256_SHA256_ASN1;
         let msg = "";
         let public_key = from_dirty_hex(
-            r#"0430345fd47ea21a11129be651b0884bfac698377611acc9f689458e1
-        3b9ed7d4b9d7599a68dcf125e7f31055ccb374cd04f6d6fd2b217438a63f6f667d50ef2f0"#,
+            r"0430345fd47ea21a11129be651b0884bfac698377611acc9f689458e1
+        3b9ed7d4b9d7599a68dcf125e7f31055ccb374cd04f6d6fd2b217438a63f6f667d50ef2f0",
         );
         let sig = from_dirty_hex(
-            r#"30440220341f6779b75e98bb42e01095dd48356cbf9002dc704ac8bd2a8240b8
-        8d3796c60220555843b1b4e264fe6ffe6e2b705a376c05c09404303ffe5d2711f3e3b3a010a1"#,
+            r"30440220341f6779b75e98bb42e01095dd48356cbf9002dc704ac8bd2a8240b8
+        8d3796c60220555843b1b4e264fe6ffe6e2b705a376c05c09404303ffe5d2711f3e3b3a010a1",
         );
         let actual_result =
             signature::UnparsedPublicKey::new(alg, &public_key).verify(msg.as_bytes(), &sig);

aws-lc-rs/src/rsa.rs

@@ -653,7 +653,7 @@ mod tests {
         use crate::signature::RsaKeyPair;
         use crate::test::from_dirty_hex;
         let rsa_pkcs8_input: Vec<u8> = from_dirty_hex(
-            r#"308204bd020100300d06092a864886f70d0101010500048204a7308204a30201000282010100b9d7a
+            r"308204bd020100300d06092a864886f70d0101010500048204a7308204a30201000282010100b9d7a
         f84fa4184a5f22037ec8aff2db5f78bd8c21e714e579ae57c6398c4950f3a694b17bfccf488766159aec5bb7c2c4
         3d59c798cbd45a09c9c86933f126879ee7eadcd404f61ecfc425197cab03946ba381a49ef3b4d0f60b17f8a747cd
         e56a834a7f6008f35ffb2f60a54ceda1974ff2a9963aba7f80d4e2916a93d8c74bb1ba5f3b189a4e8f0377bd3e94
@@ -679,7 +679,7 @@ mod tests {
         99c72f91c658a3fe5aed59f9f938c368530a4a45f4a7c7155f3906c4354030ef102818100c89e0ba805c970abd84
         a70770d8fc57bfaa34748a58b77fcddaf0ca285db91953ef5728c1be7470da5540df6af56bb04c0f5ec500f83b08
         057664cb1551e1e29c58d8b1e9d70e23ed57fdf9936c591a83c1dc954f6654d4a245b6d8676d045c2089ffce537d
-        234fc88e98d92afa92926c75b286e8fee70e273d762bbe63cd63b"#,
+        234fc88e98d92afa92926c75b286e8fee70e273d762bbe63cd63b",
         );
 
         let key = RsaKeyPair::from_pkcs8(&rsa_pkcs8_input).unwrap();

aws-lc-rs/tests/basic_rsa_test.rs

@@ -9,7 +9,7 @@ use aws_lc_rs::test::from_dirty_hex;
 #[test]
 fn test_rsa_pkcs8() {
     let rsa_pkcs8_input: Vec<u8> = from_dirty_hex(
-        r#"308204bd020100300d06092a864886f70d0101010500048204a7308204a30201000282010100b9d7a
+        r"308204bd020100300d06092a864886f70d0101010500048204a7308204a30201000282010100b9d7a
         f84fa4184a5f22037ec8aff2db5f78bd8c21e714e579ae57c6398c4950f3a694b17bfccf488766159aec5bb7c2c4
         3d59c798cbd45a09c9c86933f126879ee7eadcd404f61ecfc425197cab03946ba381a49ef3b4d0f60b17f8a747cd
         e56a834a7f6008f35ffb2f60a54ceda1974ff2a9963aba7f80d4e2916a93d8c74bb1ba5f3b189a4e8f0377bd3e94
@@ -35,7 +35,7 @@ fn test_rsa_pkcs8() {
         99c72f91c658a3fe5aed59f9f938c368530a4a45f4a7c7155f3906c4354030ef102818100c89e0ba805c970abd84
         a70770d8fc57bfaa34748a58b77fcddaf0ca285db91953ef5728c1be7470da5540df6af56bb04c0f5ec500f83b08
         057664cb1551e1e29c58d8b1e9d70e23ed57fdf9936c591a83c1dc954f6654d4a245b6d8676d045c2089ffce537d
-        234fc88e98d92afa92926c75b286e8fee70e273d762bbe63cd63b"#,
+        234fc88e98d92afa92926c75b286e8fee70e273d762bbe63cd63b",
     );
 
     let key = RsaKeyPair::from_pkcs8(&rsa_pkcs8_input);
@@ -45,7 +45,7 @@ fn test_rsa_pkcs8() {
 #[test]
 fn test_rsa_from_der() {
     let rsa_key_input: Vec<u8> = from_dirty_hex(
-        r#"308204a40201000282010100cea80475324c1dc8347827818da58bac069d3419c614a6ea1ac6a3b510dcd72cc
+        r"308204a40201000282010100cea80475324c1dc8347827818da58bac069d3419c614a6ea1ac6a3b510dcd72cc
         516954905e9fef908d45e13006adf27d467a7d83c111d1a5df15ef293771aefb920032a5bb989f8e4f5e1b05093d
         3f130f984c07a772a3683f4dc6fb28a96815b32123ccdd13954f19d5b8b24a103e771a34c328755c65ed64e1924f
         fd04d30b2142cc262f6e0048fef6dbc652f21479ea1c4b1d66d28f4d46ef7185e390cbfa2e02380582f3188bb94e
@@ -70,7 +70,7 @@ fn test_rsa_from_der() {
         46c669660dc978c5068da598524fca8a136358d3e5f8f6ad5cf78d9089c93f473189162ce0f8c4902a19902b633b
         3e6926d02818100ddc971183dcf3450c43e06ba2af32379eedeb2d678513fb706b75a006098154041f4b09e6be38
         5d4b25d80ec241c899e4a986a17b0a121daab91a1e4fc5a1802a7074df3fb3f7661f0e1c97799e36d21de937cc42
-        09585db30a56af0a228e001036ed792625e5368ce101574a2e9767f07338949f0afdf358cecd18c6d6f3f55"#,
+        09585db30a56af0a228e001036ed792625e5368ce101574a2e9767f07338949f0afdf358cecd18c6d6f3f55",
     );
 
     let key = RsaKeyPair::from_der(&rsa_key_input);
@@ -81,7 +81,7 @@ fn test_rsa_from_der() {
 fn test_sign() {
     let alg = &signature::RSA_PKCS1_SHA256;
     let private_key = from_dirty_hex(
-        r#"308204a40201000282010100cea80475324c1dc8347827818da58bac069d3419c614a6ea1ac6a3b510dcd
+        r"308204a40201000282010100cea80475324c1dc8347827818da58bac069d3419c614a6ea1ac6a3b510dcd
             72cc516954905e9fef908d45e13006adf27d467a7d83c111d1a5df15ef293771aefb920032a5bb989f8e4f5e
             1b05093d3f130f984c07a772a3683f4dc6fb28a96815b32123ccdd13954f19d5b8b24a103e771a34c328755c
             65ed64e1924ffd04d30b2142cc262f6e0048fef6dbc652f21479ea1c4b1d66d28f4d46ef7185e390cbfa2e02
@@ -108,21 +108,21 @@ fn test_sign() {
             633b3e6926d02818100ddc971183dcf3450c43e06ba2af32379eedeb2d678513fb706b75a006098154041f4b
             09e6be385d4b25d80ec241c899e4a986a17b0a121daab91a1e4fc5a1802a7074df3fb3f7661f0e1c97799e36
             d21de937cc4209585db30a56af0a228e001036ed792625e5368ce101574a2e9767f07338949f0afdf358cecd
-            18c6d6f3f55"#,
+            18c6d6f3f55",
     );
     let msg = from_dirty_hex(
-        r#"5af283b1b76ab2a695d794c23b35ca7371fc779e92ebf589e304c7f923d8cf97
+        r"5af283b1b76ab2a695d794c23b35ca7371fc779e92ebf589e304c7f923d8cf97
         6304c19818fcd89d6f07c8d8e08bf371068bdf28ae6ee83b2e02328af8c0e2f96e528e16f852f1fc5455e4772e28
         8a68f159ca6bdcf902b858a1f94789b3163823e2d0717ff56689eec7d0e54d93f520d96e1eb04515abc70ae90578
-        ff38d31b"#,
+        ff38d31b",
     );
     let expected = from_dirty_hex(
-        r#"6b8be97d9e518a2ede746ff4a7d91a84a1fc665b52f154a927650db6e73
+        r"6b8be97d9e518a2ede746ff4a7d91a84a1fc665b52f154a927650db6e73
         48c69f8c8881f7bcf9b1a6d3366eed30c3aed4e93c203c43f5528a45de791895747ade9c5fa5eee81427edee0208
         2147aa311712a6ad5fb1732e93b3d6cd23ffd46a0b3caf62a8b69957cc68ae39f9993c1a779599cdda949bdaabab
         b77f248fcfeaa44059be5459fb9b899278e929528ee130facd53372ecbc42f3e8de2998425860406440f248d8174
         32de687112e504d734028e6c5620fa282ca07647006cf0a2ff83e19a916554cc61810c2e855305db4e5cf893a6a9
-        6767365794556ff033359084d7e38a8456e68e21155b76151314a29875feee09557161cbc654541e89e42"#,
+        6767365794556ff033359084d7e38a8456e68e21155b76151314a29875feee09557161cbc654541e89e42",
     );
     let key_pair = RsaKeyPair::from_der(&private_key).unwrap();
 
@@ -139,22 +139,22 @@ fn test_sign() {
 #[test]
 fn test_rsa_verify() {
     let public_key = from_dirty_hex(
-        r#"3082010c0282010100a1a78a0092878cb43263b218d75fc924e915ae
+        r"3082010c0282010100a1a78a0092878cb43263b218d75fc924e915ae
         80f1d32cd9db690c1c7cf6942ecdb54c0357e0a55f959d53562d1f89abbd59bc24a03557b068449d0753b927a5a6
         8921281fb92e61050fe838136ddd910ba13cd71b31045823b53d0a96e19ec97bd8dffb9923743060f84d6aabbdb4
         4eb0470b34dc3223a91b9e79f68cb86ba616aa5e62ead9627eccc110a72e2b03879c360bfcad3ab0e7f3184e7ac1
         54ee2803b2c7b57824c2fe54f600668087cba6778fdda5bd8dc1a60af7295a8c793520b0f02e35d16ef58e563b79
         29cb7045f9528e7a335888e5a2ad4a9f7539209924299f7640443bace8c643cf73c249fd43d616f111450baa403a
-        9a8ce118af5e6902050100000001"#,
+        9a8ce118af5e6902050100000001",
     );
     let msg = from_dirty_hex("");
     let sig = from_dirty_hex(
-        r#"13b1addbef54e405580c0df21429fa030f3edfc7f7bd446907626d1e73e69dee
+        r"13b1addbef54e405580c0df21429fa030f3edfc7f7bd446907626d1e73e69dee
         8f5a2f1614f548e58b684da033dd8fbb7e9616408e1d1318698d10d536c622237febf2fc73d64718e791192d5c38
         326217cbfaa319e5fc1ce8cc4685d7d2f0b77c22fb11a0ce00467fbb918d5d0bf6926dd6b3bceefb15040f153abe
         5e3eb9c6ec80fe1064db69b332bf70cbeb2a483afcb09237420e1413941e2f71650cc393800efba739fecff9bf3a
         75b9ac88de483af0a0ee08d1a09f1de91f342017c53745fbe658a5980926ce56c14df45088d92e0bba61f16b8847
-        d74f3fc707c60ba82af29face1c5269a54d4185e8efce9e566c3ca0c202ac1a4cc180d5320bf599a"#,
+        d74f3fc707c60ba82af29face1c5269a54d4185e8efce9e566c3ca0c202ac1a4cc180d5320bf599a",
     );
 
     let params = &[
@@ -171,22 +171,22 @@ fn test_rsa_verify() {
 #[test]
 fn test_signature_rsa_primitive_verification() {
     let n = from_dirty_hex(
-        r#"CEA80475324C1DC8347827818DA58BAC069D3419C614A6EA1AC6A3B510DCD72CC516954905E9FEF908D45
+        r"CEA80475324C1DC8347827818DA58BAC069D3419C614A6EA1AC6A3B510DCD72CC516954905E9FEF908D45
             E13006ADF27D467A7D83C111D1A5DF15EF293771AEFB920032A5BB989F8E4F5E1B05093D3F130F984C07A772
             A3683F4DC6FB28A96815B32123CCDD13954F19D5B8B24A103E771A34C328755C65ED64E1924FFD04D30B2142
             CC262F6E0048FEF6DBC652F21479EA1C4B1D66D28F4D46EF7185E390CBFA2E02380582F3188BB94EBBF05D31
             487A09AFF01FCBB4CD4BFD1F0A833B38C11813C84360BB53C7D4481031C40BAD8713BB6B835CB08098ED15BA
-            31EE4BA728A8C8E10F7294E1B4163B7AEE57277BFD881A6F9D43E02C6925AA3A043FB7FB78D"#,
+            31EE4BA728A8C8E10F7294E1B4163B7AEE57277BFD881A6F9D43E02C6925AA3A043FB7FB78D",
     );
-    let e = from_dirty_hex(r#"260445"#);
-    let msg = from_dirty_hex(r#"68656c6c6f2c20776f726c64"#);
+    let e = from_dirty_hex(r"260445");
+    let msg = from_dirty_hex(r"68656c6c6f2c20776f726c64");
     let sig = from_dirty_hex(
-        r#"048efbc9eb5f7a6f55f6d7b9f7e6c3ce58e2db226562ca905e7f972e8f43b6969b0ad878e0d6b290c5bbf
+        r"048efbc9eb5f7a6f55f6d7b9f7e6c3ce58e2db226562ca905e7f972e8f43b6969b0ad878e0d6b290c5bbf
             2c05410a1efc9de051d91e5faa537e454306f5f526c828379fe28a17e50c8bd4e7c834479da482305a78e198
             c988a177b9263cea27a2a99c0da98e03b0cc8d880eccdeba7c16dd07f78d980739753690953d1b63106145a8
             0059ed38f52100a9a8d2c7c5371d91b70ce5b7b36d6b97ebef8798d09c01e5b6cb8a6a7fd1a4100d3527327b
             7d23f8a26187985d8702f8951346ea4a7253e87f765ef587a728021bff37be55d1a8639809e3453ea5a2da48
-            2bfedeae18579b51037cfecff5bece21d8c82ee6fa8eb0f43c43c3a23a983c3a2eea4e7d2dc"#,
+            2bfedeae18579b51037cfecff5bece21d8c82ee6fa8eb0f43c43c3a23a983c3a2eea4e7d2dc",
     );
 
     let public_key = signature::RsaPublicKeyComponents { n: &n, e: &e };

aws-lc-sys/Cargo.toml

@@ -1,7 +1,7 @@
 [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.10.1"
+version = "0.11.0"
 authors = ["AWS-LC"]
 edition = "2021"
 repository = "https://github.com/aws/aws-lc-rs"

aws-lc-sys/builder/bindgen.rs

@@ -34,40 +34,46 @@ impl ParseCallbacks for StripPrefixCallback {
     }
 }
 
-fn prepare_clang_args(manifest_dir: &Path, build_prefix: Option<&str>) -> Vec<String> {
-    let mut clang_args: Vec<String> = vec![
-        "-I".to_string(),
+fn add_header_include_path(args: &mut Vec<String>, path: String) {
+    args.push("-I".to_string());
+    args.push(path);
+}
+
+fn prepare_clang_args(manifest_dir: &Path) -> Vec<String> {
+    let mut clang_args: Vec<String> = Vec::new();
+
+    add_header_include_path(
+        &mut clang_args,
         get_rust_include_path(manifest_dir).display().to_string(),
-        "-I".to_string(),
+    );
+
+    add_header_include_path(
+        &mut clang_args,
+        get_generated_include_path(manifest_dir)
+            .display()
+            .to_string(),
+    );
+
+    add_header_include_path(
+        &mut clang_args,
         get_aws_lc_include_path(manifest_dir).display().to_string(),
-    ];
+    );
 
     if let Some(include_paths) = get_aws_lc_sys_includes_path() {
         for path in include_paths {
-            clang_args.push("-I".to_string());
-            clang_args.push(path.display().to_string());
+            add_header_include_path(&mut clang_args, path.display().to_string());
         }
     }
 
-    if let Some(prefix) = build_prefix {
-        clang_args.push(format!("-DBORINGSSL_PREFIX={prefix}"));
-        clang_args.push("-I".to_string());
-        clang_args.push(
-            get_generated_include_path(manifest_dir)
-                .display()
-                .to_string(),
-        );
-    }
-
     clang_args
 }
 
-const COPYRIGHT: &str = r#"
+const COPYRIGHT: &str = r"
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0 OR ISC
-"#;
+";
 
-const PRELUDE: &str = r#"
+const PRELUDE: &str = r"
 #![allow(
     unused_imports,
     non_camel_case_types,
@@ -86,17 +92,17 @@ const PRELUDE: &str = r#"
     clippy::used_underscore_binding,
     clippy::useless_transmute
 )]
-"#;
+";
 
 #[derive(Default)]
 pub(crate) struct BindingOptions<'a> {
-    pub build_prefix: Option<&'a str>,
+    pub build_prefix: &'a str,
     pub include_ssl: bool,
     pub disable_prelude: bool,
 }
 
 fn prepare_bindings_builder(manifest_dir: &Path, options: &BindingOptions<'_>) -> bindgen::Builder {
-    let clang_args = prepare_clang_args(manifest_dir, options.build_prefix);
+    let clang_args = prepare_clang_args(manifest_dir);
 
     let mut builder = bindgen::Builder::default()
         .derive_copy(true)
@@ -130,9 +136,7 @@ fn prepare_bindings_builder(manifest_dir: &Path, options: &BindingOptions<'_>) -
         builder = builder.clang_arg("-DAWS_LC_RUST_INCLUDE_SSL");
     }
 
-    if let Some(ps) = &options.build_prefix {
-        builder = builder.parse_callbacks(Box::new(StripPrefixCallback::new(ps)));
-    }
+    builder = builder.parse_callbacks(Box::new(StripPrefixCallback::new(options.build_prefix)));
 
     builder
 }

aws-lc-sys/builder/main.rs

@@ -140,7 +140,7 @@ fn get_cmake_config(manifest_dir: &PathBuf) -> cmake::Config {
     cmake::Config::new(manifest_dir)
 }
 
-fn prepare_cmake_build(manifest_dir: &PathBuf, build_prefix: Option<&str>) -> cmake::Config {
+fn prepare_cmake_build(manifest_dir: &PathBuf, build_prefix: String) -> cmake::Config {
     let mut cmake_cfg = get_cmake_config(manifest_dir);
 
     if OutputLibType::default() == OutputLibType::Dynamic {
@@ -158,14 +158,12 @@ fn prepare_cmake_build(manifest_dir: &PathBuf, build_prefix: Option<&str>) -> cm
         }
     }
 
-    if let Some(symbol_prefix) = build_prefix {
-        cmake_cfg.define("BORINGSSL_PREFIX", symbol_prefix);
-        let include_path = manifest_dir.join("generated-include");
-        cmake_cfg.define(
-            "BORINGSSL_PREFIX_HEADERS",
-            include_path.display().to_string(),
-        );
-    }
+    cmake_cfg.define("BORINGSSL_PREFIX", build_prefix);
+    let include_path = manifest_dir.join("generated-include");
+    cmake_cfg.define(
+        "BORINGSSL_PREFIX_HEADERS",
+        include_path.display().to_string(),
+    );
 
     // Build flags that minimize our crate size.
     cmake_cfg.define("BUILD_TESTING", "OFF");
@@ -202,7 +200,7 @@ fn prepare_cmake_build(manifest_dir: &PathBuf, build_prefix: Option<&str>) -> cm
 }
 
 fn build_rust_wrapper(manifest_dir: &PathBuf) -> PathBuf {
-    prepare_cmake_build(manifest_dir, Some(&prefix_string()))
+    prepare_cmake_build(manifest_dir, prefix_string())
         .configure_arg("--no-warn-unused-cli")
         .build()
 }
@@ -218,7 +216,7 @@ fn build_rust_wrapper(manifest_dir: &PathBuf) -> PathBuf {
 ))]
 fn generate_bindings(manifest_dir: &Path, prefix: &str, bindings_path: &PathBuf) {
     let options = bindgen::BindingOptions {
-        build_prefix: Some(prefix),
+        build_prefix: prefix,
         include_ssl: cfg!(feature = "ssl"),
         disable_prelude: true,
     };
@@ -235,7 +233,7 @@ fn generate_src_bindings(manifest_dir: &Path, prefix: &str, src_bindings_path: &
     bindgen::generate_bindings(
         manifest_dir,
         &bindgen::BindingOptions {
-            build_prefix: Some(prefix),
+            build_prefix: prefix,
             include_ssl: false,
             ..Default::default()
         },
@@ -246,7 +244,7 @@ fn generate_src_bindings(manifest_dir: &Path, prefix: &str, src_bindings_path: &
     bindgen::generate_bindings(
         manifest_dir,
         &bindgen::BindingOptions {
-            build_prefix: Some(prefix),
+            build_prefix: prefix,
             include_ssl: true,
             ..Default::default()
         },