Skip to content

Commit 9fc64b4

Browse files
committed
Address review
1 parent 110b4a4 commit 9fc64b4

File tree

4 files changed

+6
-13
lines changed

4 files changed

+6
-13
lines changed

openssl-sys/build/cfgs.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,6 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
3434
if libressl_version >= 0x3_03_02_00_0 {
3535
cfgs.push("libressl332");
3636
}
37-
if libressl_version >= 0x3_03_03_00_0 {
38-
cfgs.push("libressl333");
39-
}
40-
if libressl_version >= 0x3_04_00_00_0 {
41-
cfgs.push("libressl340");
42-
}
4337
} else {
4438
let openssl_version = openssl_version.unwrap();
4539

openssl-sys/build/main.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ See rust-openssl README for more information:
234234
(3, 3, 1) => ('3', '3', '1'),
235235
(3, 3, _) => ('3', '3', 'x'),
236236
(3, 4, 0) => ('3', '4', '0'),
237-
(3, 4, _) => ('3', '4', 'x'),
238237
_ => version_error(),
239238
};
240239

@@ -275,7 +274,7 @@ fn version_error() -> ! {
275274
"
276275
277276
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5
278-
through 3.4.x, but a different version of OpenSSL was found. The build is now aborting
277+
through 3.4.0, but a different version of OpenSSL was found. The build is now aborting
279278
due to this version mismatch.
280279
281280
"

openssl-sys/src/ssl.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ cfg_if! {
315315
if #[cfg(ossl102)] {
316316
pub const SSL_OP_NO_DTLSv1: c_ulong = 0x04000000;
317317
pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x08000000;
318-
} else if #[cfg(libressl340)] {
318+
} else if #[cfg(libressl332)] {
319319
pub const SSL_OP_NO_DTLSv1: c_ulong = 0x40000000;
320320
pub const SSL_OP_NO_DTLSv1_2: c_ulong = 0x80000000;
321321
}

openssl/src/ssl/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ bitflags! {
211211

212212
/// Disables the use of DTLSv1.0
213213
///
214-
/// Requires OpenSSL 1.0.2 or LibreSSL 3.4.0 or newer.
215-
#[cfg(any(ossl102, ossl110, libressl340))]
214+
/// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.
215+
#[cfg(any(ossl102, ossl110, libressl332))]
216216
const NO_DTLSV1 = ffi::SSL_OP_NO_DTLSv1;
217217

218218
/// Disables the use of DTLSv1.2.
219219
///
220-
/// Requires OpenSSL 1.0.2 or LibreSSL 3.4.0 or newer.
221-
#[cfg(any(ossl102, ossl110, libressl340))]
220+
/// Requires OpenSSL 1.0.2 or LibreSSL 3.3.2 or newer.
221+
#[cfg(any(ossl102, ossl110, libressl332))]
222222
const NO_DTLSV1_2 = ffi::SSL_OP_NO_DTLSv1_2;
223223

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

0 commit comments

Comments
 (0)