kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

net/openldap24-server: Fix regression with LibreSSL 2.6

Browse source 
PR:		227734
Reported by:	dewayne heuristicsystems com.au
Approved by:	maintainer (delphij)
This commit is contained in:
Bernard Spil 2018-04-24 17:10:05 +00:00
parent f01f10327d
commit 40ad94c187
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=468222
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
net/openldap24-server/files/patch-libressl
View file

@ -1,4 +1,4 @@
--- libraries/libldap/tls_o.c.orig 2018-03-30 09:32:58 UTC
--- libraries/libldap/tls_o.c.orig 2018-03-22 15:44:27 UTC
+++ libraries/libldap/tls_o.c
@@ -47,7 +47,7 @@
#include <ssl.h>
@ -9,7 +9,16 @@
#define ASN1_STRING_data(x) ASN1_STRING_get0_data(x)
#endif
@@ -157,7 +157,7 @@ tlso_init( void )
@@ -116,7 +116,7 @@ static void tlso_thr_init( void ) {}
#endif
#endif /* OpenSSL 1.1 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
/*
* OpenSSL 1.1 API and later makes the BIO method concrete types internal.
*/
@@ -197,7 +197,7 @@ tlso_init( void )
(void) tlso_seed_PRNG( lo->ldo_tls_randfile );
#endif
@ -18,7 +27,7 @@
SSL_load_error_strings();
SSL_library_init();
OpenSSL_add_all_digests();
@@ -205,7 +205,7 @@ static void
@@ -249,7 +249,7 @@ static void
tlso_ctx_ref( tls_ctx *ctx )
{
tlso_ctx *c = (tlso_ctx *)ctx;
@ -27,7 +36,7 @@
#define SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )
#endif
SSL_CTX_up_ref( c );
@@ -464,7 +464,7 @@ tlso_session_my_dn( tls_session *sess, s
@@ -508,7 +508,7 @@ tlso_session_my_dn( tls_session *sess, s
if (!x) return LDAP_INVALID_CREDENTIALS;
xn = X509_get_subject_name(x);
@ -36,7 +45,7 @@
der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
@@ -500,7 +500,7 @@ tlso_session_peer_dn( tls_session *sess,
@@ -544,7 +544,7 @@ tlso_session_peer_dn( tls_session *sess,
return LDAP_INVALID_CREDENTIALS;
xn = X509_get_subject_name(x);
@ -45,7 +54,7 @@
der_dn->bv_len = i2d_X509_NAME( xn, NULL );
der_dn->bv_val = xn->bytes->data;
#else
@@ -721,7 +721,7 @@ struct tls_data {
@@ -765,7 +765,7 @@ struct tls_data {
Sockbuf_IO_Desc *sbiod;
};