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

Collapse All | Expand All

(-)files/patch-sec__negotiate__openssl.h (+11 lines)
Line 0 Link Here
1 
--- src/tds/sec_negotiate_openssl.h.orig	2017-03-05 00:49:44 UTC
2 
+++ src/tds/sec_negotiate_openssl.h
3 
@@ -40,7 +40,7 @@
4 
 static inline const BIGNUM*
5 
 rsa_get_n(const RSA *rsa)
6 
 {
7 
-#if OPENSSL_VERSION_NUMBER >= 0x1010000FL
8 
+#if OPENSSL_VERSION_NUMBER >= 0x1010000FL && !defined(LIBRESSL_VERSION_NUMBER)
9 
 	const BIGNUM *n, *e, *d;
10 
 	RSA_get0_key(rsa, &n, &e, &d);
11 
 	return n;
(-)files/patch-src_tds_tls.c (-4 / +22 lines)
Lines 1-8 Link Here
1 
--- src/tds/tls.c.orig	2015-06-09 10:38:40 UTC
 1 
--- src/tds/tls.c.orig	2017-03-04 23:24:01 UTC
2 
+++ src/tds/tls.c
 2 
+++ src/tds/tls.c
3 
@@ -46,6 +46,10 @@
 3 
@@ -50,6 +50,10 @@
4 
 #include <sys/stat.h>
 4 
 #include <sys/socket.h>
5 
 #endif /* HAVE_SYS_STAT_H */
 5 
 #endif
6
6
7 
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 7 
+#if defined(__FreeBSD__) || defined(__DragonFly__)
8 
+#include <sys/socket.h>
 8 
+#include <sys/socket.h>
Lines 11-13 Link Here
11 
 #include <freetds/tds.h>
 11 
 #include <freetds/tds.h>
12 
 #include <freetds/string.h>
 12 
 #include <freetds/string.h>
13 
 #include <freetds/tls.h>
 13 
 #include <freetds/tls.h>
14 
@@ -73,7 +77,7 @@
15 
 #else
16
17 
 /* some compatibility layer */
18 
-#if OPENSSL_VERSION_NUMBER < 0x1010000FL
19 
+#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
20 
 static inline void
21 
 BIO_set_init(BIO *b, int init)
22 
 {
23 
@@ -590,7 +594,7 @@ tds_ssl_free(BIO *a)
24 
 	return 1;
25 
 }
26
27 
-#if OPENSSL_VERSION_NUMBER < 0x1010000FL
28 
+#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
29 
 static BIO_METHOD tds_method_login[1] = {
30 
 {
31 
 	BIO_TYPE_MEM,

Return to bug 217549