Merge remote-tracking branch 'openssl/master'

Author: zh-jq

openssl-sys/build/cfgs.rs

@@ -80,6 +80,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
         if libressl_version >= 0x4_01_00_00_0 {
             cfgs.push("libressl410");
         }
+        if libressl_version >= 0x4_02_00_00_0 {
+            cfgs.push("libressl420");
+        }
     } else {
         let openssl_version = openssl_version.unwrap();
 

openssl-sys/build/main.rs

@@ -1,3 +1,8 @@
+#![allow(
+    // This can be removed once our MSRV is raised to 1.66.
+    clippy::uninlined_format_args,
+)]
+
 #[cfg(feature = "bindgen")]
 extern crate bindgen;
 extern crate cc;
@@ -176,6 +181,7 @@ fn main() {
     println!("cargo:rustc-check-cfg=cfg(libressl390)");
     println!("cargo:rustc-check-cfg=cfg(libressl400)");
     println!("cargo:rustc-check-cfg=cfg(libressl410)");
+    println!("cargo:rustc-check-cfg=cfg(libressl420)");
 
     println!("cargo:rustc-check-cfg=cfg(ossl101)");
     println!("cargo:rustc-check-cfg=cfg(ossl102)");

openssl-sys/src/handwritten/evp.rs

@@ -512,17 +512,21 @@ cfg_if! {
         }
     }
 }
+const_ptr_api! {
+    extern "C" {
+        pub fn EVP_PKEY_get1_RSA(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut RSA;
+        pub fn EVP_PKEY_get1_DSA(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut DSA;
+        pub fn EVP_PKEY_get1_DH(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut DH;
+        pub fn EVP_PKEY_get1_EC_KEY(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut EC_KEY;
+    }
+}
 extern "C" {
     pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *mut c_void) -> c_int;
 
     pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;
-    pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;
     pub fn EVP_PKEY_set1_DSA(k: *mut EVP_PKEY, k: *mut DSA) -> c_int;
-    pub fn EVP_PKEY_get1_DSA(k: *mut EVP_PKEY) -> *mut DSA;
     pub fn EVP_PKEY_set1_DH(k: *mut EVP_PKEY, k: *mut DH) -> c_int;
-    pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH;
     pub fn EVP_PKEY_set1_EC_KEY(k: *mut EVP_PKEY, k: *mut EC_KEY) -> c_int;
-    pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY;
 
     pub fn EVP_PKEY_new() -> *mut EVP_PKEY;
     pub fn EVP_PKEY_free(k: *mut EVP_PKEY);

openssl-sys/src/lib.rs

@@ -159,12 +159,12 @@ mod openssl {
             _file: *const c_char,
             _line: c_int,
         ) {
-            let mutex = &(*MUTEXES)[n as usize];
+            let mutex = &(&(*MUTEXES))[n as usize];
 
             if mode & CRYPTO_LOCK != 0 {
-                (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());
+                (&mut (*GUARDS))[n as usize] = Some(mutex.lock().unwrap());
             } else {
-                if let None = (*GUARDS)[n as usize].take() {
+                if let None = (&mut (*GUARDS))[n as usize].take() {
                     let _ = writeln!(
                         io::stderr(),
                         "BUG: rust-openssl lock {} already unlocked, aborting",