View | Details | Raw Unified | Return to bug 225261
Collapse All | Expand All

(-)databases/percona56-client/files/patch-sql-common_client.c (+38 lines)
Added Link Here
1 
--- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
2 
+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
3 
@@ -1884,7 +1884,7 @@
4 
     *errptr= "Failed to get DNS name from SAN list item";
5 
     DBUG_RETURN(1);
6 
   }
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
9 
   cn= (const char *)ASN1_STRING_data(dns_name);
10 
 #else
11 
   cn= (const char *)ASN1_STRING_get0_data(dns_name);
12 
@@ -1946,7 +1946,7 @@
13 
     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
14 
     DBUG_RETURN(1);
15 
   }
16 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
18 
   ip= ASN1_STRING_data(ip_address);
19 
 #else
20 
   ip= ASN1_STRING_get0_data(ip_address);
21 
@@ -2111,7 +2111,7 @@
22 
   if(server_ip_address != NULL)
23 
   {
24 
     iplen= ASN1_STRING_length(server_ip_address);
25 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
26 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
27 
     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
28 
 #else
29 
     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
30 
@@ -2163,7 +2163,7 @@
31 
       goto error;
32 
     }
33
34 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
35 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
36 
     cn= (const char *) ASN1_STRING_data(cn_asn1);
37 
 #else
38 
     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
(-)databases/percona56-client/files/patch-vio_viosslfactories.c (+11 lines)
Added Link Here
1 
--- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
2 
+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
3 
@@ -125,7 +125,7 @@
4 
   {
5 
     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
6 
     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
9 
     dh->p= p;
10 
     dh->g= g;
11 
     if (! dh->p || ! dh->g)
(-)databases/percona56-server/files/patch-sql-common_client.c (+38 lines)
Added Link Here
1 
--- sql-common/client.c.orig	2018-01-17 11:39:51.315029000 +0000
2 
+++ sql-common/client.c	2018-01-17 11:44:53.493273000 +0000
3 
@@ -1884,7 +1884,7 @@
4 
     *errptr= "Failed to get DNS name from SAN list item";
5 
     DBUG_RETURN(1);
6 
   }
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
9 
   cn= (const char *)ASN1_STRING_data(dns_name);
10 
 #else
11 
   cn= (const char *)ASN1_STRING_get0_data(dns_name);
12 
@@ -1946,7 +1946,7 @@
13 
     *errptr= "Invalid IP address embedded in the certificate SAN IP address";
14 
     DBUG_RETURN(1);
15 
   }
16 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
17 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
18 
   ip= ASN1_STRING_data(ip_address);
19 
 #else
20 
   ip= ASN1_STRING_get0_data(ip_address);
21 
@@ -2111,7 +2111,7 @@
22 
   if(server_ip_address != NULL)
23 
   {
24 
     iplen= ASN1_STRING_length(server_ip_address);
25 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
26 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
27 
     ipout= (const unsigned char *) ASN1_STRING_data(server_ip_address);
28 
 #else
29 
     ipout= (const unsigned char *) ASN1_STRING_get0_data(server_ip_address);
30 
@@ -2163,7 +2163,7 @@
31 
       goto error;
32 
     }
33
34 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
35 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
36 
     cn= (const char *) ASN1_STRING_data(cn_asn1);
37 
 #else
38 
     cn= (const char *) ASN1_STRING_get0_data(cn_asn1);
(-)databases/percona56-server/files/patch-vio_viosslfactories.c (+11 lines)
Added Link Here
1 
--- vio/viosslfactories.c.orig	2018-01-17 11:42:33.764076000 +0000
2 
+++ vio/viosslfactories.c	2018-01-17 11:43:21.072238000 +0000
3 
@@ -125,7 +125,7 @@
4 
   {
5 
     BIGNUM* p= BN_bin2bn(dh2048_p,sizeof(dh2048_p),NULL);
6 
     BIGNUM* g= BN_bin2bn(dh2048_g,sizeof(dh2048_g),NULL);
7 
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
8 
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined( LIBRESSL_VERSION_NUMBER )
9 
     dh->p= p;
10 
     dh->g= g;
11 
     if (! dh->p || ! dh->g)

Return to bug 225261