View | Details | Raw Unified | Return to bug 266670 | Differences between
and this patch

Collapse All | Expand All

(-)b/lang/rust/files/patch-libressl (+57 lines)
Added Link Here
1
--- vendor/libssh2-sys/libssh2/src/openssl.h
2
+++ vendor/libssh2-sys/libssh2/src/openssl.h
3
@@ -57,8 +57,11 @@
4
 #include <openssl/pem.h>
5
 #include <openssl/rand.h>
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
8
-    !defined(LIBRESSL_VERSION_NUMBER)
9
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && \
10
+    !defined(LIBRESSL_VERSION_NUMBER)) || defined(LIBSSH2_WOLFSSL) || \
11
+    LIBRESSL_VERSION_NUMBER >= 0x3050000fL
12
+/* For wolfSSL, whether the structs are truly opaque or not, it's best to not
13
+ * rely on their internal data members being exposed publicly. */
14
 # define HAVE_OPAQUE_STRUCTS 1
15
 #endif
16
 
17
--- vendor/openssl-sys/build/cfgs.rs
18
+++ vendor/openssl-sys/build/cfgs.rs
19
@@ -34,6 +34,24 @@
20
         if libressl_version >= 0x3_03_02_00_0 {
21
             cfgs.push("libressl332");
22
         }
23
+        if libressl_version >= 0x3_04_00_00_0 {
24
+            cfgs.push("libressl340");
25
+        }
26
+        if libressl_version >= 0x3_05_00_00_0 {
27
+            cfgs.push("libressl350");
28
+        }
29
+        if libressl_version >= 0x3_06_00_00_0 {
30
+            cfgs.push("libressl360");
31
+        }
32
+        if libressl_version >= 0x3_07_00_00_0 {
33
+            cfgs.push("libressl370");
34
+        }
35
+        if libressl_version >= 0x3_08_00_00_0 {
36
+            cfgs.push("libressl380");
37
+        }
38
+        if libressl_version >= 0x3_09_00_00_0 {
39
+            cfgs.push("libressl390");
40
+        }
41
     } else {
42
         let openssl_version = openssl_version.unwrap();
43
 
44
--- vendor/openssl-sys/build/main.rs
45
+++ vendor/openssl-sys/build/main.rs
46
@@ -254,6 +254,11 @@
47
             (3, 3, _) => ('3', '3', 'x'),
48
             (3, 4, 0) => ('3', '4', '0'),
49
             (3, 4, _) => ('3', '4', 'x'),
50
+            (3, 5, _) => ('3', '5', 'x'),
51
+            (3, 6, _) => ('3', '6', 'x'),
52
+            (3, 7, _) => ('3', '7', 'x'),
53
+            (3, 8, _) => ('3', '8', 'x'),
54
+            (3, 9, _) => ('3', '9', 'x'),
55
             _ => version_error(),
56
         };
57
 

Return to bug 266670