Skip to content

Commit 13e607d

Browse files
justsmthjustsmth
authored
Fix bindgen include file allowlist (#463)
1 parent 7824ec2 commit 13e607d

22 files changed

+302
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn prepare_bindings_builder(manifest_dir: &Path, options: &BindingOptions) -> bi
6262
.derive_debug(true)
6363
.derive_default(true)
6464
.derive_eq(true)
65-
.allowlist_file(r".*(/|\\)openssl(/|\\)[^/\\]+\.h")
65+
.allowlist_file(r".*(/|\\)openssl((/|\\)[^/\\]+)+\.h")
6666
.allowlist_file(r".*(/|\\)rust_wrapper\.h")
6767
.rustified_enum(r"point_conversion_form_t")
6868
.default_macro_constant_type(bindgen::MacroTypeVariation::Signed)

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:39:13 UTC 2024
3+
// Wed Jul 17 13:42:43 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:42:58 UTC 2024
3+
// Wed Jul 17 13:47:15 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:44:00 UTC 2024
3+
// Wed Jul 17 13:48:44 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:42:50 UTC 2024
3+
// Wed Jul 17 13:47:36 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:41:31 UTC 2024
3+
// Wed Jul 17 13:45:33 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:39:13 UTC 2024
3+
// Wed Jul 17 13:43:23 UTC 2024
44

55
use crate::cc_builder::Library;
66

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

Lines changed: 1 addition & 1 deletion
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 Jul 15 16:43:43 UTC 2024
3+
// Wed Jul 17 13:49:36 UTC 2024
44

55
use crate::cc_builder::Library;
66

‎aws-lc-sys/src/aarch64_apple_darwin_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27305,6 +27305,27 @@ extern "C" {
2730527305
encrypted_bit: u8,
2730627306
) -> ::std::os::raw::c_int;
2730727307
}
27308+
extern "C" {
27309+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27310+
pub fn EVP_PKEY_keygen_deterministic(
27311+
ctx: *mut EVP_PKEY_CTX,
27312+
out_pkey: *mut *mut EVP_PKEY,
27313+
seed: *const u8,
27314+
seed_len: *mut usize,
27315+
) -> ::std::os::raw::c_int;
27316+
}
27317+
extern "C" {
27318+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27319+
pub fn EVP_PKEY_encapsulate_deterministic(
27320+
ctx: *mut EVP_PKEY_CTX,
27321+
ciphertext: *mut u8,
27322+
ciphertext_len: *mut usize,
27323+
shared_secret: *mut u8,
27324+
shared_secret_len: *mut usize,
27325+
seed: *const u8,
27326+
seed_len: *mut usize,
27327+
) -> ::std::os::raw::c_int;
27328+
}
2730827329
extern "C" {
2730927330
#[link_name = "\u{1}_aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2731027331
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

‎aws-lc-sys/src/aarch64_apple_darwin_crypto_ssl.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28326,6 +28326,27 @@ extern "C" {
2832628326
encrypted_bit: u8,
2832728327
) -> ::std::os::raw::c_int;
2832828328
}
28329+
extern "C" {
28330+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
28331+
pub fn EVP_PKEY_keygen_deterministic(
28332+
ctx: *mut EVP_PKEY_CTX,
28333+
out_pkey: *mut *mut EVP_PKEY,
28334+
seed: *const u8,
28335+
seed_len: *mut usize,
28336+
) -> ::std::os::raw::c_int;
28337+
}
28338+
extern "C" {
28339+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
28340+
pub fn EVP_PKEY_encapsulate_deterministic(
28341+
ctx: *mut EVP_PKEY_CTX,
28342+
ciphertext: *mut u8,
28343+
ciphertext_len: *mut usize,
28344+
shared_secret: *mut u8,
28345+
shared_secret_len: *mut usize,
28346+
seed: *const u8,
28347+
seed_len: *mut usize,
28348+
) -> ::std::os::raw::c_int;
28349+
}
2832928350
#[repr(C)]
2833028351
#[repr(align(4))]
2833128352
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

‎aws-lc-sys/src/aarch64_unknown_linux_gnu_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27340,6 +27340,27 @@ extern "C" {
2734027340
encrypted_bit: u8,
2734127341
) -> ::std::os::raw::c_int;
2734227342
}
27343+
extern "C" {
27344+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27345+
pub fn EVP_PKEY_keygen_deterministic(
27346+
ctx: *mut EVP_PKEY_CTX,
27347+
out_pkey: *mut *mut EVP_PKEY,
27348+
seed: *const u8,
27349+
seed_len: *mut usize,
27350+
) -> ::std::os::raw::c_int;
27351+
}
27352+
extern "C" {
27353+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27354+
pub fn EVP_PKEY_encapsulate_deterministic(
27355+
ctx: *mut EVP_PKEY_CTX,
27356+
ciphertext: *mut u8,
27357+
ciphertext_len: *mut usize,
27358+
shared_secret: *mut u8,
27359+
shared_secret_len: *mut usize,
27360+
seed: *const u8,
27361+
seed_len: *mut usize,
27362+
) -> ::std::os::raw::c_int;
27363+
}
2734327364
extern "C" {
2734427365
#[link_name = "\u{1}aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2734527366
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

‎aws-lc-sys/src/aarch64_unknown_linux_gnu_crypto_ssl.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28360,6 +28360,27 @@ extern "C" {
2836028360
encrypted_bit: u8,
2836128361
) -> ::std::os::raw::c_int;
2836228362
}
28363+
extern "C" {
28364+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
28365+
pub fn EVP_PKEY_keygen_deterministic(
28366+
ctx: *mut EVP_PKEY_CTX,
28367+
out_pkey: *mut *mut EVP_PKEY,
28368+
seed: *const u8,
28369+
seed_len: *mut usize,
28370+
) -> ::std::os::raw::c_int;
28371+
}
28372+
extern "C" {
28373+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
28374+
pub fn EVP_PKEY_encapsulate_deterministic(
28375+
ctx: *mut EVP_PKEY_CTX,
28376+
ciphertext: *mut u8,
28377+
ciphertext_len: *mut usize,
28378+
shared_secret: *mut u8,
28379+
shared_secret_len: *mut usize,
28380+
seed: *const u8,
28381+
seed_len: *mut usize,
28382+
) -> ::std::os::raw::c_int;
28383+
}
2836328384
#[repr(C)]
2836428385
#[repr(align(4))]
2836528386
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

‎aws-lc-sys/src/aarch64_unknown_linux_musl_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27030,6 +27030,27 @@ extern "C" {
2703027030
encrypted_bit: u8,
2703127031
) -> ::std::os::raw::c_int;
2703227032
}
27033+
extern "C" {
27034+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27035+
pub fn EVP_PKEY_keygen_deterministic(
27036+
ctx: *mut EVP_PKEY_CTX,
27037+
out_pkey: *mut *mut EVP_PKEY,
27038+
seed: *const u8,
27039+
seed_len: *mut usize,
27040+
) -> ::std::os::raw::c_int;
27041+
}
27042+
extern "C" {
27043+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27044+
pub fn EVP_PKEY_encapsulate_deterministic(
27045+
ctx: *mut EVP_PKEY_CTX,
27046+
ciphertext: *mut u8,
27047+
ciphertext_len: *mut usize,
27048+
shared_secret: *mut u8,
27049+
shared_secret_len: *mut usize,
27050+
seed: *const u8,
27051+
seed_len: *mut usize,
27052+
) -> ::std::os::raw::c_int;
27053+
}
2703327054
extern "C" {
2703427055
#[link_name = "\u{1}aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2703527056
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

‎aws-lc-sys/src/aarch64_unknown_linux_musl_crypto_ssl.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28050,6 +28050,27 @@ extern "C" {
2805028050
encrypted_bit: u8,
2805128051
) -> ::std::os::raw::c_int;
2805228052
}
28053+
extern "C" {
28054+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
28055+
pub fn EVP_PKEY_keygen_deterministic(
28056+
ctx: *mut EVP_PKEY_CTX,
28057+
out_pkey: *mut *mut EVP_PKEY,
28058+
seed: *const u8,
28059+
seed_len: *mut usize,
28060+
) -> ::std::os::raw::c_int;
28061+
}
28062+
extern "C" {
28063+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
28064+
pub fn EVP_PKEY_encapsulate_deterministic(
28065+
ctx: *mut EVP_PKEY_CTX,
28066+
ciphertext: *mut u8,
28067+
ciphertext_len: *mut usize,
28068+
shared_secret: *mut u8,
28069+
shared_secret_len: *mut usize,
28070+
seed: *const u8,
28071+
seed_len: *mut usize,
28072+
) -> ::std::os::raw::c_int;
28073+
}
2805328074
#[repr(C)]
2805428075
#[repr(align(4))]
2805528076
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

‎aws-lc-sys/src/i686_unknown_linux_gnu_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27341,6 +27341,27 @@ extern "C" {
2734127341
encrypted_bit: u8,
2734227342
) -> ::std::os::raw::c_int;
2734327343
}
27344+
extern "C" {
27345+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27346+
pub fn EVP_PKEY_keygen_deterministic(
27347+
ctx: *mut EVP_PKEY_CTX,
27348+
out_pkey: *mut *mut EVP_PKEY,
27349+
seed: *const u8,
27350+
seed_len: *mut usize,
27351+
) -> ::std::os::raw::c_int;
27352+
}
27353+
extern "C" {
27354+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27355+
pub fn EVP_PKEY_encapsulate_deterministic(
27356+
ctx: *mut EVP_PKEY_CTX,
27357+
ciphertext: *mut u8,
27358+
ciphertext_len: *mut usize,
27359+
shared_secret: *mut u8,
27360+
shared_secret_len: *mut usize,
27361+
seed: *const u8,
27362+
seed_len: *mut usize,
27363+
) -> ::std::os::raw::c_int;
27364+
}
2734427365
extern "C" {
2734527366
#[link_name = "\u{1}aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2734627367
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

‎aws-lc-sys/src/i686_unknown_linux_gnu_crypto_ssl.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28361,6 +28361,27 @@ extern "C" {
2836128361
encrypted_bit: u8,
2836228362
) -> ::std::os::raw::c_int;
2836328363
}
28364+
extern "C" {
28365+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
28366+
pub fn EVP_PKEY_keygen_deterministic(
28367+
ctx: *mut EVP_PKEY_CTX,
28368+
out_pkey: *mut *mut EVP_PKEY,
28369+
seed: *const u8,
28370+
seed_len: *mut usize,
28371+
) -> ::std::os::raw::c_int;
28372+
}
28373+
extern "C" {
28374+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
28375+
pub fn EVP_PKEY_encapsulate_deterministic(
28376+
ctx: *mut EVP_PKEY_CTX,
28377+
ciphertext: *mut u8,
28378+
ciphertext_len: *mut usize,
28379+
shared_secret: *mut u8,
28380+
shared_secret_len: *mut usize,
28381+
seed: *const u8,
28382+
seed_len: *mut usize,
28383+
) -> ::std::os::raw::c_int;
28384+
}
2836428385
#[repr(C)]
2836528386
#[repr(align(4))]
2836628387
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

‎aws-lc-sys/src/x86_64_apple_darwin_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27305,6 +27305,27 @@ extern "C" {
2730527305
encrypted_bit: u8,
2730627306
) -> ::std::os::raw::c_int;
2730727307
}
27308+
extern "C" {
27309+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27310+
pub fn EVP_PKEY_keygen_deterministic(
27311+
ctx: *mut EVP_PKEY_CTX,
27312+
out_pkey: *mut *mut EVP_PKEY,
27313+
seed: *const u8,
27314+
seed_len: *mut usize,
27315+
) -> ::std::os::raw::c_int;
27316+
}
27317+
extern "C" {
27318+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27319+
pub fn EVP_PKEY_encapsulate_deterministic(
27320+
ctx: *mut EVP_PKEY_CTX,
27321+
ciphertext: *mut u8,
27322+
ciphertext_len: *mut usize,
27323+
shared_secret: *mut u8,
27324+
shared_secret_len: *mut usize,
27325+
seed: *const u8,
27326+
seed_len: *mut usize,
27327+
) -> ::std::os::raw::c_int;
27328+
}
2730827329
extern "C" {
2730927330
#[link_name = "\u{1}_aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2731027331
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

‎aws-lc-sys/src/x86_64_apple_darwin_crypto_ssl.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28326,6 +28326,27 @@ extern "C" {
2832628326
encrypted_bit: u8,
2832728327
) -> ::std::os::raw::c_int;
2832828328
}
28329+
extern "C" {
28330+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
28331+
pub fn EVP_PKEY_keygen_deterministic(
28332+
ctx: *mut EVP_PKEY_CTX,
28333+
out_pkey: *mut *mut EVP_PKEY,
28334+
seed: *const u8,
28335+
seed_len: *mut usize,
28336+
) -> ::std::os::raw::c_int;
28337+
}
28338+
extern "C" {
28339+
#[link_name = "\u{1}_aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
28340+
pub fn EVP_PKEY_encapsulate_deterministic(
28341+
ctx: *mut EVP_PKEY_CTX,
28342+
ciphertext: *mut u8,
28343+
ciphertext_len: *mut usize,
28344+
shared_secret: *mut u8,
28345+
shared_secret_len: *mut usize,
28346+
seed: *const u8,
28347+
seed_len: *mut usize,
28348+
) -> ::std::os::raw::c_int;
28349+
}
2832928350
#[repr(C)]
2833028351
#[repr(align(4))]
2833128352
#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)]

‎aws-lc-sys/src/x86_64_unknown_linux_gnu_crypto.rs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27340,6 +27340,27 @@ extern "C" {
2734027340
encrypted_bit: u8,
2734127341
) -> ::std::os::raw::c_int;
2734227342
}
27343+
extern "C" {
27344+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_keygen_deterministic"]
27345+
pub fn EVP_PKEY_keygen_deterministic(
27346+
ctx: *mut EVP_PKEY_CTX,
27347+
out_pkey: *mut *mut EVP_PKEY,
27348+
seed: *const u8,
27349+
seed_len: *mut usize,
27350+
) -> ::std::os::raw::c_int;
27351+
}
27352+
extern "C" {
27353+
#[link_name = "\u{1}aws_lc_0_20_0_EVP_PKEY_encapsulate_deterministic"]
27354+
pub fn EVP_PKEY_encapsulate_deterministic(
27355+
ctx: *mut EVP_PKEY_CTX,
27356+
ciphertext: *mut u8,
27357+
ciphertext_len: *mut usize,
27358+
shared_secret: *mut u8,
27359+
shared_secret_len: *mut usize,
27360+
seed: *const u8,
27361+
seed_len: *mut usize,
27362+
) -> ::std::os::raw::c_int;
27363+
}
2734327364
extern "C" {
2734427365
#[link_name = "\u{1}aws_lc_0_20_0_ERR_GET_LIB_RUST"]
2734527366
pub fn ERR_GET_LIB_RUST(packed_error: u32) -> ::std::os::raw::c_int;

0 commit comments

Comments
 (0)