diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-18 02:49:50 +0000 |
| commit | 9835e2ae736235810b4ea1c162ca5e65c547e770 (patch) | |
| tree | 3fcebf40ed70e581d776a8a4c65923e8ec20e026 /vendor/openssl-sys/build | |
| parent | Releasing progress-linux version 1.70.0+dfsg2-1~progress7.99u1. (diff) | |
| download | rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.tar.xz rustc-9835e2ae736235810b4ea1c162ca5e65c547e770.zip | |
Merging upstream version 1.71.1+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'vendor/openssl-sys/build')
| -rw-r--r-- | vendor/openssl-sys/build/main.rs | 3 | ||||
| -rw-r--r-- | vendor/openssl-sys/build/run_bindgen.rs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vendor/openssl-sys/build/main.rs b/vendor/openssl-sys/build/main.rs index 5c1f668fb..ba149c17f 100644 --- a/vendor/openssl-sys/build/main.rs +++ b/vendor/openssl-sys/build/main.rs @@ -284,6 +284,7 @@ See rust-openssl documentation for more information: (3, 6, _) => ('3', '6', 'x'), (3, 7, 0) => ('3', '7', '0'), (3, 7, 1) => ('3', '7', '1'), + (3, 7, _) => ('3', '7', 'x'), _ => version_error(), }; @@ -326,7 +327,7 @@ fn version_error() -> ! { " This crate is only compatible with OpenSSL (version 1.0.1 through 1.1.1, or 3.0.0), or LibreSSL 2.5 -through 3.7.1, but a different version of OpenSSL was found. The build is now aborting +through 3.7.x, but a different version of OpenSSL was found. The build is now aborting due to this version mismatch. " diff --git a/vendor/openssl-sys/build/run_bindgen.rs b/vendor/openssl-sys/build/run_bindgen.rs index 0c127ae5c..4fa9ec66f 100644 --- a/vendor/openssl-sys/build/run_bindgen.rs +++ b/vendor/openssl-sys/build/run_bindgen.rs @@ -12,6 +12,7 @@ const INCLUDES: &str = " #include <openssl/aes.h> #include <openssl/asn1.h> #include <openssl/bio.h> +#include <openssl/cmac.h> #include <openssl/conf.h> #include <openssl/crypto.h> #include <openssl/dh.h> @@ -111,7 +112,6 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) { .ctypes_prefix("::libc") .derive_default(false) .enable_function_attribute_detection() - .size_t_is_usize(true) .default_macro_constant_type(MacroTypeVariation::Signed) .rustified_enum("point_conversion_form_t") .allowlist_file(".*/openssl/[^/]+\\.h") @@ -167,7 +167,6 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) { .arg("--ctypes-prefix=::libc") .arg("--no-derive-default") .arg("--enable-function-attribute-detection") - .arg("--size_t-is-usize") .arg("--default-macro-constant-type=signed") .arg("--rustified-enum=point_conversion_form_t") .arg("--allowlist-file=.*/openssl/[^/]+\\.h") |