Commit 9fc64b43 authored by Henrik Böving's avatar Henrik Böving
Browse files

Address review

parent 110b4a46

openssl-sys/build/cfgs.rs

+0 −6
Original line number Diff line number Diff line
@@ -34,12 +34,6 @@ 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_03_03_00_0 {

            cfgs.push("libressl333");

        }

        if libressl_version >= 0x3_04_00_00_0 {

            cfgs.push("libressl340");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

+1 −2
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ See rust-openssl README for more information: 
            (3, 3, 1) => ('3', '3', '1'),

            (3, 3, _) => ('3', '3', 'x'),

            (3, 4, 0) => ('3', '4', '0'),

            (3, 4, _) => ('3', '4', 'x'),

            _ => version_error(),

        };
@@ -275,7 +274,7 @@ fn version_error() -> ! { 
        "



This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5

through 3.4.x, but a different version of OpenSSL was found. The build is now aborting

through 3.4.0, but a different version of OpenSSL was found. The build is now aborting

due to this version mismatch.



"

openssl-sys/src/ssl.rs

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ cfg_if! { 
    if #[cfg(ossl102)] {

        pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000;

        pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000;

    } else if #[cfg(libressl340)] {

    } else if #[cfg(libressl332)] {

        pub const SSL_OP_NO_DTLSv1: c_ulong = 0x40000000;

        pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x80000000;

    }

openssl/src/ssl/mod.rs

+4 −4
Original line number Diff line number Diff line
@@ -211,14 +211,14 @@ bitflags! { 


        /// Disables the use of DTLSv1.0

        ///

        /// Requires OpenSSL 1.0.2 or LibreSSL 3.4.0 or newer.

        #[cfg(any(ossl102, ossl110, libressl340))]

        /// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.

        #[cfg(any(ossl102, ossl110, libressl332))]

        const NO_DTLSV1 = ffi::SSL_OP_NO_DTLSv1;



        /// Disables the use of DTLSv1.2.

        ///

        /// Requires OpenSSL 1.0.2 or LibreSSL 3.4.0 or newer.

        #[cfg(any(ossl102, ossl110, libressl340))]

        /// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.

        #[cfg(any(ossl102, ossl110, libressl332))]

        const NO_DTLSV1_2 = ffi::SSL_OP_NO_DTLSv1_2;



        /// Disables the use of all (D)TLS protocol versions.