|
Line 0
Link Here
|
|
|
1 |
--- cargo-crates/openssl-sys-0.9.46/build/main.rs.orig 2019-12-23 12:35:08 UTC |
| 2 |
+++ cargo-crates/openssl-sys-0.9.46/build/main.rs |
| 3 |
@@ -183,28 +183,33 @@ See rust-openssl README for more information: |
| 4 |
if let Some(libressl_version) = libressl_version { |
| 5 |
println!("cargo:libressl_version_number={:x}", libressl_version); |
| 6 |
|
| 7 |
+ let major = (libressl_version >> 28) as u8; |
| 8 |
let minor = (libressl_version >> 20) as u8; |
| 9 |
let fix = (libressl_version >> 12) as u8; |
| 10 |
- let (minor, fix) = match (minor, fix) { |
| 11 |
- (5, 0) => ('5', '0'), |
| 12 |
- (5, 1) => ('5', '1'), |
| 13 |
- (5, 2) => ('5', '2'), |
| 14 |
- (5, _) => ('5', 'x'), |
| 15 |
- (6, 0) => ('6', '0'), |
| 16 |
- (6, 1) => ('6', '1'), |
| 17 |
- (6, 2) => ('6', '2'), |
| 18 |
- (6, _) => ('6', 'x'), |
| 19 |
- (7, _) => ('7', 'x'), |
| 20 |
- (8, 0) => ('8', '0'), |
| 21 |
- (8, 1) => ('8', '1'), |
| 22 |
- (8, _) => ('8', 'x'), |
| 23 |
- (9, 0) => ('9', '0'), |
| 24 |
- (9, _) => ('9', 'x'), |
| 25 |
- _ => version_error(), |
| 26 |
+ let (major, minor, fix) = match (major, minor, fix) { |
| 27 |
+ (2, 5, 0) => ('2', '5', '0'), |
| 28 |
+ (2, 5, 1) => ('2', '5', '1'), |
| 29 |
+ (2, 5, 2) => ('2', '5', '2'), |
| 30 |
+ (2, 5, _) => ('2', '5', 'x'), |
| 31 |
+ (2, 6, 0) => ('2', '6', '0'), |
| 32 |
+ (2, 6, 1) => ('2', '6', '1'), |
| 33 |
+ (2, 6, 2) => ('2', '6', '2'), |
| 34 |
+ (2, 6, _) => ('2', '6', 'x'), |
| 35 |
+ (2, 7, _) => ('2', '7', 'x'), |
| 36 |
+ (2, 8, 0) => ('2', '8', '0'), |
| 37 |
+ (2, 8, 1) => ('2', '8', '1'), |
| 38 |
+ (2, 8, _) => ('2', '8', 'x'), |
| 39 |
+ (2, 9, 0) => ('2', '9', '0'), |
| 40 |
+ (2, 9, _) => ('2', '9', 'x'), |
| 41 |
+ (3, 0, 0) => ('3', '0', '0'), |
| 42 |
+ (3, 0, 1) => ('3', '0', '1'), |
| 43 |
+ (3, 0, 2) => ('3', '0', '2'), |
| 44 |
+ (3, 0, _) => ('3', '0', 'x'), |
| 45 |
+ _ => version_error(), |
| 46 |
}; |
| 47 |
|
| 48 |
println!("cargo:libressl=true"); |
| 49 |
- println!("cargo:libressl_version=2{}{}", minor, fix); |
| 50 |
+ println!("cargo:libressl_version={}{}{}", major, minor, fix); |
| 51 |
println!("cargo:version=101"); |
| 52 |
Version::Libressl |
| 53 |
} else { |
| 54 |
@@ -240,7 +245,7 @@ fn version_error() -> ! { |
| 55 |
" |
| 56 |
|
| 57 |
This crate is only compatible with OpenSSL 1.0.1 through 1.1.1, or LibreSSL 2.5 |
| 58 |
-through 2.9.x, but a different version of OpenSSL was found. The build is now aborting |
| 59 |
+through 3.0.x, but a different version of OpenSSL was found. The build is now aborting |
| 60 |
due to this version mismatch. |
| 61 |
|
| 62 |
" |