diff options
| author | brnrd <brnrd@FreeBSD.org> | 2018-04-25 01:10:05 +0800 |
|---|---|---|
| committer | brnrd <brnrd@FreeBSD.org> | 2018-04-25 01:10:05 +0800 |
| commit | dcd2c9330efb292fb1cec997eba8de711d6956e6 (patch) | |
| tree | 9c1ec71102ebf307077614383d8d7bdc3f696127 | |
| parent | 5336e0a10122277b37668e0afa2bb033f5b68890 (diff) | |
| download | freebsd-ports-gnome-dcd2c9330efb292fb1cec997eba8de711d6956e6.tar.gz freebsd-ports-gnome-dcd2c9330efb292fb1cec997eba8de711d6956e6.tar.zst freebsd-ports-gnome-dcd2c9330efb292fb1cec997eba8de711d6956e6.zip | |
net/openldap24-server: Fix regression with LibreSSL 2.6
PR: 227734
Reported by: dewayne heuristicsystems com.au
Approved by: maintainer (delphij)
| -rw-r--r-- | net/openldap24-server/files/patch-libressl | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/net/openldap24-server/files/patch-libressl b/net/openldap24-server/files/patch-libressl index 759a137ac6e1..38963912be2e 100644 --- a/net/openldap24-server/files/patch-libressl +++ b/net/openldap24-server/files/patch-libressl @@ -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; }; |