Merge pull request #2302 from sfackler/sfackler-patch-1

Test against 3.4.0-alpha1
sfackler · Sep 8, 2024 · 8d60e21 · 8d60e21
2 parents 22a66be + 92130d5
commit 8d60e21
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -153,22 +153,25 @@ jobs:
               version: e23fe9b6eecc10e4f9ea1f0027fea5eaee7bd6b6
             - name: openssl
               version: vendored
+            - name: openssl
+              version: 3.4.0-alpha1
             - name: openssl
               version: 3.3.0
             - name: openssl
               version: 3.2.0
-              dl-path: /
             - name: openssl
               version: 1.1.1w
-              dl-path: /
             - name: openssl
               version: 1.1.0l
+              old: true
               dl-path: /old/1.1.0
             - name: openssl
               version: 1.0.2u
+              old: true
               dl-path: /old/1.0.2
             - name: openssl
               version: 1.0.1u
+              old: true
               dl-path: /old/1.0.1
           include:
             - target: x86_64-unknown-linux-gnu
@@ -255,7 +258,11 @@ jobs:
           run: |
             case "${{ matrix.library.name }}" in
             "openssl")
-              url="https://www.openssl.org/source${{ matrix.library.dl-path }}/openssl-${{ matrix.library.version }}.tar.gz"
+              if [[ "${{ matrix.library.old }}" == "true" ]]; then
+                url="https://www.openssl.org/source${{ matrix.library.dl-path }}/openssl-${{ matrix.library.version }}.tar.gz"
+              else
+                url="https://github.com/openssl/openssl/releases/download/openssl-${{ matrix.library.version }}/openssl-${{ matrix.library.version }}.tar.gz"
+              fi
               tar_flags="--strip-components=1"
               ;;
             "libressl")

diff --git 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
@@ -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
@@ -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
@@ -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;
+    }
+}
diff --git a/openssl/src/version.rs b/openssl/src/version.rs
@@ -131,5 +131,4 @@ fn test_versions() {
     if !built_on().is_empty() {
         assert!(built_on().starts_with("built on:"));
     }
-    assert!(dir().starts_with("OPENSSLDIR:"));
 }