Skip to content

Commit ff176da

Browse files
botovqbotovq
committed
Merge pull request #2499 from rust-openssl/botovq-rm-libressl-3.4
2 parents db109f7 + 348f25e commit ff176da

File tree

19 files changed

+48
-73
lines changed

19 files changed

+48
-73
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
bindgen: true
191191
library:
192192
name: libressl
193-
version: 3.4.3
193+
version: 3.5.3
194194
- target: x86_64-unknown-linux-gnu
195195
bindgen: true
196196
library:
@@ -210,7 +210,7 @@ jobs:
210210
bindgen: false
211211
library:
212212
name: libressl
213-
version: 3.4.3
213+
version: 3.5.3
214214
- target: x86_64-unknown-linux-gnu
215215
bindgen: false
216216
library:

‎openssl-sys/build/cfgs.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<&
1818
cfgs.push("libressl321");
1919
cfgs.push("libressl332");
2020
cfgs.push("libressl340");
21+
cfgs.push("libressl350");
2122

22-
if libressl_version >= 0x3_05_00_00_0 {
23-
cfgs.push("libressl350");
24-
}
2523
if libressl_version >= 0x3_06_00_00_0 {
2624
cfgs.push("libressl360");
2725
}

‎openssl-sys/build/main.rs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -418,8 +418,6 @@ See rust-openssl documentation for more information:
418418
let minor = (libressl_version >> 20) as u8;
419419
let fix = (libressl_version >> 12) as u8;
420420
let (major, minor, fix) = match (major, minor, fix) {
421-
(3, 4, 0) => ('3', '4', '0'),
422-
(3, 4, _) => ('3', '4', 'x'),
423421
(3, 5, _) => ('3', '5', 'x'),
424422
(3, 6, 0) => ('3', '6', '0'),
425423
(3, 6, _) => ('3', '6', 'x'),
@@ -474,7 +472,7 @@ fn version_error() -> ! {
474472
panic!(
475473
"
476474
477-
This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, or 3), or LibreSSL 3.4
475+
This crate is only compatible with OpenSSL (version 1.0.2 through 1.1.1, or 3), or LibreSSL 3.5
478476
through 4.2.x, but a different version of OpenSSL was found. The build is now aborting
479477
due to this version mismatch.
480478

‎openssl-sys/src/handwritten/asn1.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ extern "C" {
6868
pub fn ASN1_GENERALIZEDTIME_free(tm: *mut ASN1_GENERALIZEDTIME);
6969
pub fn ASN1_GENERALIZEDTIME_print(b: *mut BIO, tm: *const ASN1_GENERALIZEDTIME) -> c_int;
7070
pub fn ASN1_TIME_new() -> *mut ASN1_TIME;
71-
#[cfg(any(ossl102, libressl350))]
7271
pub fn ASN1_TIME_diff(
7372
pday: *mut c_int,
7473
psec: *mut c_int,

‎openssl-sys/src/handwritten/bn.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ extern "C" {
3030
pub fn BN_mul(r: *mut BIGNUM, a: *const BIGNUM, b: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
3131
pub fn BN_sqr(r: *mut BIGNUM, a: *const BIGNUM, ctx: *mut BN_CTX) -> c_int;
3232
pub fn BN_set_negative(bn: *mut BIGNUM, n: c_int);
33-
#[cfg(any(ossl110, libressl350))]
33+
#[cfg(any(ossl110, libressl))]
3434
pub fn BN_is_negative(b: *const BIGNUM) -> c_int;
35-
#[cfg(any(ossl110, libressl350))]
35+
#[cfg(any(ossl110, libressl))]
3636
pub fn BN_is_odd(b: *const BIGNUM) -> c_int;
3737

3838
pub fn BN_div(
@@ -150,7 +150,7 @@ extern "C" {
150150
}
151151

152152
cfg_if! {
153-
if #[cfg(any(ossl110, libressl350))] {
153+
if #[cfg(any(ossl110, libressl))] {
154154
extern "C" {
155155
pub fn BN_get_rfc2409_prime_768(bn: *mut BIGNUM) -> *mut BIGNUM;
156156
pub fn BN_get_rfc2409_prime_1024(bn: *mut BIGNUM) -> *mut BIGNUM;

‎openssl-sys/src/handwritten/ec.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ extern "C" {
9090

9191
pub fn EC_POINT_dup(p: *const EC_POINT, group: *const EC_GROUP) -> *mut EC_POINT;
9292

93-
#[cfg(any(ossl111, boringssl, libressl350, awslc))]
93+
#[cfg(any(ossl111, boringssl, libressl, awslc))]
9494
pub fn EC_POINT_get_affine_coordinates(
9595
group: *const EC_GROUP,
9696
p: *const EC_POINT,
9797
x: *mut BIGNUM,
9898
y: *mut BIGNUM,
9999
ctx: *mut BN_CTX,
100100
) -> c_int;
101-
#[cfg(any(ossl111, boringssl, libressl350, awslc))]
101+
#[cfg(any(ossl111, boringssl, libressl, awslc))]
102102
pub fn EC_POINT_set_affine_coordinates(
103103
group: *const EC_GROUP,
104104
p: *mut EC_POINT,

‎openssl-sys/src/handwritten/hmac.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use super::super::*;
44

55
#[cfg(not(osslconf = "OPENSSL_NO_DEPRECATED_3_0"))]
66
cfg_if! {
7-
if #[cfg(any(ossl110, libressl350))] {
7+
if #[cfg(any(ossl110, libressl))] {
88
extern "C" {
99
pub fn HMAC_CTX_new() -> *mut HMAC_CTX;
1010
pub fn HMAC_CTX_free(ctx: *mut HMAC_CTX);

‎openssl-sys/src/handwritten/ssl.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,11 +574,11 @@ extern "C" {
574574
pub fn SSL_stateless(s: *mut SSL) -> c_int;
575575
pub fn SSL_connect(ssl: *mut SSL) -> c_int;
576576
pub fn SSL_read(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int;
577-
#[cfg(any(ossl111, libressl350))]
577+
#[cfg(any(ossl111, libressl))]
578578
pub fn SSL_read_ex(ssl: *mut SSL, buf: *mut c_void, num: usize, readbytes: *mut usize)
579579
-> c_int;
580580
pub fn SSL_peek(ssl: *mut SSL, buf: *mut c_void, num: c_int) -> c_int;
581-
#[cfg(any(ossl111, libressl350))]
581+
#[cfg(any(ossl111, libressl))]
582582
pub fn SSL_peek_ex(ssl: *mut SSL, buf: *mut c_void, num: usize, readbytes: *mut usize)
583583
-> c_int;
584584
#[cfg(any(ossl111, libressl))]
@@ -601,7 +601,7 @@ extern "C" {
601601

602602
extern "C" {
603603
pub fn SSL_write(ssl: *mut SSL, buf: *const c_void, num: c_int) -> c_int;
604-
#[cfg(any(ossl111, libressl350))]
604+
#[cfg(any(ossl111, libressl))]
605605
pub fn SSL_write_ex(
606606
ssl: *mut SSL,
607607
buf: *const c_void,

‎openssl-sys/src/handwritten/types.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ cfg_if! {
6767
}
6868
}
6969
cfg_if! {
70-
if #[cfg(any(ossl110, libressl350))] {
70+
if #[cfg(any(ossl110, libressl))] {
7171
pub enum BIGNUM {}
7272
} else {
7373
#[repr(C)]
@@ -770,7 +770,7 @@ cfg_if! {
770770
pub enum COMP_CTX {}
771771

772772
cfg_if! {
773-
if #[cfg(all(any(ossl110, libressl350), not(osslconf = "OPENSSL_NO_COMP")))] {
773+
if #[cfg(all(any(ossl110, libressl), not(osslconf = "OPENSSL_NO_COMP")))] {
774774
pub enum COMP_METHOD {}
775775
} else if #[cfg(not(osslconf = "OPENSSL_NO_COMP"))] {
776776
#[repr(C)]

‎openssl-sys/src/handwritten/x509.rs‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ pub enum X509_ATTRIBUTE {}
2828
stack!(stack_st_X509_ATTRIBUTE);
2929

3030
cfg_if! {
31-
if #[cfg(any(ossl110, libressl350))] {
31+
if #[cfg(any(ossl110, libressl))] {
3232
pub enum X509_REQ_INFO {}
3333
} else {
3434
#[repr(C)]
@@ -43,7 +43,7 @@ cfg_if! {
4343
}
4444

4545
cfg_if! {
46-
if #[cfg(any(ossl110, libressl350))] {
46+
if #[cfg(any(ossl110, libressl))] {
4747
pub enum X509_CRL {}
4848
} else {
4949
#[repr(C)]
@@ -70,7 +70,7 @@ cfg_if! {
7070
stack!(stack_st_X509_CRL);
7171

7272
cfg_if! {
73-
if #[cfg(any(ossl110, libressl350))] {
73+
if #[cfg(any(ossl110, libressl))] {
7474
pub enum X509_CRL_INFO {}
7575
} else {
7676
#[repr(C)]
@@ -88,7 +88,7 @@ cfg_if! {
8888
}
8989

9090
cfg_if! {
91-
if #[cfg(any(ossl110, libressl350))] {
91+
if #[cfg(any(ossl110, libressl))] {
9292
pub enum X509_REVOKED {}
9393
} else {
9494
#[repr(C)]
@@ -106,7 +106,7 @@ cfg_if! {
106106
stack!(stack_st_X509_REVOKED);
107107

108108
cfg_if! {
109-
if #[cfg(any(ossl110, libressl350))] {
109+
if #[cfg(any(ossl110, libressl))] {
110110
pub enum X509_REQ {}
111111
} else {
112112
#[repr(C)]
@@ -120,7 +120,7 @@ cfg_if! {
120120
}
121121

122122
cfg_if! {
123-
if #[cfg(any(ossl110, libressl350))] {
123+
if #[cfg(any(ossl110, libressl))] {
124124
pub enum X509_CINF {}
125125
} else {
126126
#[repr(C)]
@@ -205,12 +205,11 @@ extern "C" {
205205

206206
const_ptr_api! {
207207
extern "C" {
208-
#[cfg(any(ossl102, libressl350))]
209208
pub fn X509_ALGOR_get0(
210-
paobj: *mut #[const_ptr_if(any(ossl110, libressl350))] ASN1_OBJECT,
209+
paobj: *mut #[const_ptr_if(any(ossl110, libressl))] ASN1_OBJECT,
211210
pptype: *mut c_int,
212-
ppval: *mut #[const_ptr_if(any(ossl110, libressl350))] c_void,
213-
alg: #[const_ptr_if(any(ossl110, libressl350))] X509_ALGOR,
211+
ppval: *mut #[const_ptr_if(any(ossl110, libressl))] c_void,
212+
alg: #[const_ptr_if(any(ossl110, libressl))] X509_ALGOR,
214213
);
215214
}
216215
}
@@ -344,7 +343,7 @@ const_ptr_api! {
344343
}
345344
}
346345
cfg_if! {
347-
if #[cfg(any(ossl110, libressl350))] {
346+
if #[cfg(any(ossl110, libressl))] {
348347
extern "C" {
349348
pub fn X509_set1_notBefore(x: *mut X509, tm: *const ASN1_TIME) -> c_int;
350349
pub fn X509_set1_notAfter(x: *mut X509, tm: *const ASN1_TIME) -> c_int;
@@ -357,10 +356,10 @@ cfg_if! {
357356
}
358357
}
359358
extern "C" {
360-
#[cfg(any(ossl110, libressl350))]
359+
#[cfg(any(ossl110, libressl))]
361360
pub fn X509_REQ_get_version(req: *const X509_REQ) -> c_long;
362361
pub fn X509_REQ_set_version(req: *mut X509_REQ, version: c_long) -> c_int;
363-
#[cfg(any(ossl110, libressl350))]
362+
#[cfg(any(ossl110, libressl))]
364363
pub fn X509_REQ_get_subject_name(req: *const X509_REQ) -> *mut X509_NAME;
365364
}
366365
const_ptr_api! {
@@ -670,7 +669,7 @@ extern "C" {
670669
}
671670

672671
cfg_if! {
673-
if #[cfg(any(ossl110, libressl350))] {
672+
if #[cfg(any(ossl110, libressl))] {
674673
extern "C" {
675674
pub fn X509_OBJECT_free(a: *mut X509_OBJECT);
676675
}

0 commit comments

Comments
 (0)