Attachment 180521 Details for Bug 217549 – proposed-svn-diff_freetds

[patch] proposed-svn-diff_freetds

svn-diff_freetds (text/plain), 2.15 KB, created by Walter Schwarzenfeld on 2017-03-05 01:02:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Walter Schwarzenfeld

Created: 2017-03-05 01:02:34 UTC

Size: 2.15 KB

patch

obsolete

>Index: files/patch-sec__negotiate__openssl.h
>===================================================================
>--- files/patch-sec__negotiate__openssl.h	(nonexistent)
>+++ files/patch-sec__negotiate__openssl.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/tds/sec_negotiate_openssl.h.orig	2017-03-05 00:49:44 UTC
>++++ src/tds/sec_negotiate_openssl.h
>+@@ -40,7 +40,7 @@
>+ static inline const BIGNUM*
>+ rsa_get_n(const RSA *rsa)
>+ {
>+-#if OPENSSL_VERSION_NUMBER >= 0x1010000FL
>++#if OPENSSL_VERSION_NUMBER >= 0x1010000FL && !defined(LIBRESSL_VERSION_NUMBER)
>+ 	const BIGNUM *n, *e, *d;
>+ 	RSA_get0_key(rsa, &n, &e, &d);
>+ 	return n;
>
>Property changes on: files/patch-sec__negotiate__openssl.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:keywords
>## -0,0 +1 ##
>+Author Date Id Rev URL
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_tds_tls.c
>===================================================================
>--- files/patch-src_tds_tls.c	(revision 435435)
>+++ files/patch-src_tds_tls.c	(working copy)
>@@ -1,8 +1,8 @@
>---- src/tds/tls.c.orig	2015-06-09 10:38:40 UTC
>+--- src/tds/tls.c.orig	2017-03-04 23:24:01 UTC
> +++ src/tds/tls.c
>-@@ -46,6 +46,10 @@
>- #include <sys/stat.h>
>- #endif /* HAVE_SYS_STAT_H */
>+@@ -50,6 +50,10 @@
>+ #include <sys/socket.h>
>+ #endif
>  
> +#if defined(__FreeBSD__) || defined(__DragonFly__)
> +#include <sys/socket.h>
>@@ -11,3 +11,21 @@
>  #include <freetds/tds.h>
>  #include <freetds/string.h>
>  #include <freetds/tls.h>
>+@@ -73,7 +77,7 @@
>+ #else
>+ 
>+ /* some compatibility layer */
>+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL
>++#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
>+ static inline void
>+ BIO_set_init(BIO *b, int init)
>+ {
>+@@ -590,7 +594,7 @@ tds_ssl_free(BIO *a)
>+ 	return 1;
>+ }
>+ 
>+-#if OPENSSL_VERSION_NUMBER < 0x1010000FL
>++#if OPENSSL_VERSION_NUMBER < 0x1010000FL || defined(LIBRESSL_VERSION_NUMBER)
>+ static BIO_METHOD tds_method_login[1] = {
>+ {
>+ 	BIO_TYPE_MEM,

Actions: View | Diff

Attachments on bug 217549: 180521 | 180568 | 180569