From 16e41768f254af561ea96e0274744fb35758fb83 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Sun, 8 Sep 2024 16:12:25 -0400
Subject: [PATCH] fixes

---
 openssl-sys/build/cfgs.rs  |  3 +++
 openssl-sys/build/main.rs  |  1 +
 openssl-sys/src/evp.rs     | 26 +++++++++++++++++++++-----
 openssl-sys/src/obj_mac.rs |  8 +++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs
index bbd3be59f3..cd03888e62 100644
--- a/openssl-sys/build/cfgs.rs
+++ b/openssl-sys/build/cfgs.rs
@@ -71,6 +71,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
     } else {
         let openssl_version = openssl_version.unwrap();
 
+        if openssl_version >= 0x3_04_00_00_0 {
+            cfgs.push("ossl340");
+        }
         if openssl_version >= 0x3_03_00_00_0 {
             cfgs.push("ossl330");
         }
diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
index 50ecc0f084..c9bddf5382 100644
--- a/openssl-sys/build/main.rs
+++ b/openssl-sys/build/main.rs
@@ -120,6 +120,7 @@ fn main() {
     println!("cargo:rustc-check-cfg=cfg(ossl310)");
     println!("cargo:rustc-check-cfg=cfg(ossl320)");
     println!("cargo:rustc-check-cfg=cfg(ossl330)");
+    println!("cargo:rustc-check-cfg=cfg(ossl340)");
 
     check_ssl_kind();
 
diff --git a/openssl-sys/src/evp.rs b/openssl-sys/src/evp.rs
index a3a8a84fb5..4d26f0f607 100644
--- a/openssl-sys/src/evp.rs
+++ b/openssl-sys/src/evp.rs
@@ -184,12 +184,28 @@ cfg_if! {
         pub const EVP_PKEY_OP_DERIVE: c_int = 1 << 10;
     }
 }
+#[cfg(ossl340)]
+pub const EVP_PKEY_OP_SIGNMSG: c_int = 1 << 14;
+#[cfg(ossl340)]
+pub const EVP_PKEY_OP_VERIFYMSG: c_int = 1 << 15;
 
-pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN
-    | EVP_PKEY_OP_VERIFY
-    | EVP_PKEY_OP_VERIFYRECOVER
-    | EVP_PKEY_OP_SIGNCTX
-    | EVP_PKEY_OP_VERIFYCTX;
+cfg_if! {
+    if #[cfg(ossl340)] {
+        pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN
+            | EVP_PKEY_OP_SIGNMSG
+            | EVP_PKEY_OP_VERIFY
+            | EVP_PKEY_OP_VERIFYMSG
+            | EVP_PKEY_OP_VERIFYRECOVER
+            | EVP_PKEY_OP_SIGNCTX
+            | EVP_PKEY_OP_VERIFYCTX;
+    } else {
+        pub const EVP_PKEY_OP_TYPE_SIG: c_int = EVP_PKEY_OP_SIGN
+            | EVP_PKEY_OP_VERIFY
+            | EVP_PKEY_OP_VERIFYRECOVER
+            | EVP_PKEY_OP_SIGNCTX
+            | EVP_PKEY_OP_VERIFYCTX;
+    }
+}
 
 pub const EVP_PKEY_OP_TYPE_CRYPT: c_int = EVP_PKEY_OP_ENCRYPT | EVP_PKEY_OP_DECRYPT;
 
diff --git a/openssl-sys/src/obj_mac.rs b/openssl-sys/src/obj_mac.rs
index 400f73388f..8dd720a7ac 100644
--- a/openssl-sys/src/obj_mac.rs
+++ b/openssl-sys/src/obj_mac.rs
@@ -346,7 +346,6 @@ pub const NID_id_mod_cmp2000: c_int = 284;
 pub const NID_info_access: c_int = 177;
 pub const NID_biometricInfo: c_int = 285;
 pub const NID_qcStatements: c_int = 286;
-pub const NID_ac_auditEntity: c_int = 287;
 pub const NID_ac_targeting: c_int = 288;
 pub const NID_aaControls: c_int = 289;
 pub const NID_sbgp_ipAddrBlock: c_int = 290;
@@ -1015,3 +1014,10 @@ pub const NID_shake256: c_int = 1101;
 pub const NID_chacha20_poly1305: c_int = 1018;
 #[cfg(libressl271)]
 pub const NID_chacha20_poly1305: c_int = 967;
+cfg_if! {
+    if #[cfg(ossl340)] {
+        pub const NID_ac_auditEntity: c_int = 1323;
+    } else {
+        pub const NID_ac_auditEntity: c_int = 287;
+    }
+}