Yet Another Attempt to LibreSSL 3.5.x

sfackler · May 2, 2022 · ea03bc0 · ea03bc0
1 parent c30d4fd
commit ea03bc0
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -179,6 +179,11 @@ jobs:
               library:
                 name: libressl
                 version: 3.4.2
+            - target: x86_64-unknown-linux-gnu
+              bindgen: true
+              library:
+                name: libressl
+                version: 3.5.2
             - target: x86_64-unknown-linux-gnu
               bindgen: false
               library:
@@ -189,6 +194,11 @@ jobs:
               library:
                 name: libressl
                 version: 3.4.2
+            - target: x86_64-unknown-linux-gnu
+              bindgen: false
+              library:
+                name: libressl
+                version: 3.5.2
       name: ${{ matrix.target }}-${{ matrix.library.name }}-${{ matrix.library.version }}-${{ matrix.bindgen }}
       runs-on: ubuntu-latest
       env:

diff --git a/openssl-sys/build/cfgs.rs b/openssl-sys/build/cfgs.rs
@@ -34,6 +34,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
         if libressl_version >= 0x3_03_02_00_0 {
             cfgs.push("libressl332");
         }
+        if libressl_version >= 0x3_05_00_00_0 {
+            cfgs.push("libressl350");
+        }
     } else {
         let openssl_version = openssl_version.unwrap();
 

diff --git a/openssl-sys/build/main.rs b/openssl-sys/build/main.rs
@@ -267,6 +267,7 @@ See rust-openssl README for more information:
             (3, 3, _) => ('3', '3', 'x'),
             (3, 4, 0) => ('3', '4', '0'),
             (3, 4, _) => ('3', '4', 'x'),
+            (3, 5, _) => ('3', '5', 'x'),
             _ => version_error(),
         };
 
@@ -309,7 +310,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.4.1, but a different version of OpenSSL was found. The build is now aborting
+through 3.5, but a different version of OpenSSL was found. The build is now aborting
 due to this version mismatch.
 
 "

diff --git a/openssl-sys/src/handwritten/bn.rs b/openssl-sys/src/handwritten/bn.rs
@@ -28,7 +28,7 @@ extern "C" {
     pub fn BN_mul(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
     pub fn BN_sqr(r: *mut BIGNUM, a: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
     pub fn BN_set_negative(bn: *mut BIGNUM, n: c_int);
-    #[cfg(ossl110)]
+    #[cfg(any(ossl110, libressl350))]
     pub fn BN_is_negative(b: *const ::BIGNUM) -> c_int;
 
     pub fn BN_div(
@@ -138,7 +138,7 @@ extern "C" {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         extern "C" {
             pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
             pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;

diff --git a/openssl-sys/src/handwritten/hmac.rs b/openssl-sys/src/handwritten/hmac.rs
@@ -3,7 +3,7 @@ use libc::*;
 use *;
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         extern "C" {
             pub fn HMAC_CTX_new() -> *mut HMAC_CTX;
             pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX);

diff --git a/openssl-sys/src/handwritten/types.rs b/openssl-sys/src/handwritten/types.rs
@@ -40,7 +40,7 @@ cfg_if! {
     }
 }
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum BIGNUM {}
     } else {
         #[repr(C)]
@@ -1019,7 +1019,7 @@ cfg_if! {
 pub enum COMP_CTX {}
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum COMP_METHOD {}
     } else {
         #[repr(C)]

diff --git a/openssl-sys/src/handwritten/x509.rs b/openssl-sys/src/handwritten/x509.rs
@@ -18,7 +18,7 @@ stack!(stack_st_X509_EXTENSION);
 stack!(stack_st_X509_ATTRIBUTE);
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_REQ_INFO {}
     } else {
         #[repr(C)]
@@ -33,7 +33,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_CRL {}
     } else {
         #[repr(C)]
@@ -60,7 +60,7 @@ cfg_if! {
 stack!(stack_st_X509_CRL);
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_CRL_INFO {}
     } else {
         #[repr(C)]
@@ -78,7 +78,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_REVOKED {}
     } else {
         #[repr(C)]
@@ -96,7 +96,7 @@ cfg_if! {
 stack!(stack_st_X509_REVOKED);
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_REQ {}
     } else {
         #[repr(C)]
@@ -110,7 +110,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         pub enum X509_CINF {}
     } else {
         #[repr(C)]
@@ -185,12 +185,12 @@ extern "C" {
 
 const_ptr_api! {
     extern "C" {
-        #[cfg(ossl102)]
+        #[cfg(any(ossl102, libressl350))]
         pub fn X509_ALGOR_get0(
-            paobj: *mut #[const_ptr_if(ossl110)] ASN1_OBJECT,
+            paobj: *mut #[const_ptr_if(any(ossl110, libressl350))] ASN1_OBJECT,
             pptype: *mut c_int,
-            ppval: *mut #[const_ptr_if(ossl110)] c_void,
-            alg: #[const_ptr_if(ossl110)] X509_ALGOR,
+            ppval: *mut #[const_ptr_if(any(ossl110, libressl350))] c_void,
+            alg: #[const_ptr_if(any(ossl110, libressl350))] X509_ALGOR,
         );
     }
 }
@@ -317,7 +317,7 @@ const_ptr_api! {
     }
 }
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         extern "C" {
             pub fn X509_set1_notBefore(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
             pub fn X509_set1_notAfter(x: *mut ::X509, tm: *const ::ASN1_TIME) -> c_int;
@@ -330,10 +330,10 @@ cfg_if! {
     }
 }
 extern "C" {
-    #[cfg(ossl110)]
+    #[cfg(any(ossl110, libressl350))]
     pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long;
     pub fn X509_REQ_set_version(req: *mut X509_REQ, version: c_long) -> c_int;
-    #[cfg(ossl110)]
+    #[cfg(any(ossl110, libressl350))]
     pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut X509_NAME;
 }
 const_ptr_api! {
@@ -606,7 +606,7 @@ extern "C" {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         extern "C" {
             pub fn X509_OBJECT_free(a: *mut X509_OBJECT);
         }

diff --git a/openssl-sys/src/handwritten/x509_vfy.rs b/openssl-sys/src/handwritten/x509_vfy.rs
@@ -59,7 +59,7 @@ extern "C" {
     pub fn X509_STORE_CTX_set_error(ctx: *mut X509_STORE_CTX, error: c_int);
 }
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         const_ptr_api! {
             extern "C" {
                 pub fn X509_STORE_CTX_get0_chain(ctx: #[const_ptr_if(ossl300)] X509_STORE_CTX) -> *mut stack_st_X509;

diff --git a/openssl-sys/src/x509.rs b/openssl-sys/src/x509.rs
@@ -9,7 +9,7 @@ pub const X509_FILETYPE_DEFAULT: c_int = 3;
 pub const ASN1_R_HEADER_TOO_LONG: c_int = 123;
 
 cfg_if! {
-    if #[cfg(not(ossl110))] {
+    if #[cfg(not(any(ossl110, libressl350)))] {
         pub const X509_LU_FAIL: c_int = 0;
         pub const X509_LU_X509: c_int = 1;
         pub const X509_LU_CRL: c_int = 2;

diff --git a/openssl/build.rs b/openssl/build.rs
@@ -81,5 +81,9 @@ fn main() {
         if version >= 0x3_04_00_00_0 {
             println!("cargo:rustc-cfg=libressl340");
         }
+
+        if version >= 0x3_05_00_00_0 {
+            println!("cargo:rustc-cfg=libressl350");
+        }
     }
 }
diff --git a/openssl/src/bn.rs b/openssl/src/bn.rs
@@ -37,7 +37,7 @@ use crate::{cvt, cvt_n, cvt_p};
 use openssl_macros::corresponds;
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         use ffi::{
             BN_get_rfc2409_prime_1024, BN_get_rfc2409_prime_768, BN_get_rfc3526_prime_1536,
             BN_get_rfc3526_prime_2048, BN_get_rfc3526_prime_3072, BN_get_rfc3526_prime_4096,

diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs
@@ -1534,7 +1534,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         use ffi::{
             X509_ALGOR_get0, ASN1_STRING_get0_data, X509_STORE_CTX_get0_chain, X509_set1_notAfter,
             X509_set1_notBefore, X509_REQ_get_version, X509_REQ_get_subject_name,
@@ -1589,7 +1589,7 @@ cfg_if! {
 }
 
 cfg_if! {
-    if #[cfg(ossl110)] {
+    if #[cfg(any(ossl110, libressl350))] {
         use ffi::X509_OBJECT_free;
     } else {
         #[allow(bad_style)]