Attachment 192655 Details for Bug 227192 – build fix

[patch] build fix

openldap24-server.patch (text/plain), 1.87 KB, created by Ivan Rozhuk on 2018-04-19 15:31:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ivan Rozhuk

Created: 2018-04-19 15:31:14 UTC

Size: 1.87 KB

patch

obsolete

>Index: net/openldap24-server/files/patch-libressl
>===================================================================
>--- net/openldap24-server/files/patch-libressl	(revision 467765)
>+++ net/openldap24-server/files/patch-libressl	(working copy)
>@@ -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 @@
>+ #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 @@
>  	(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 @@
>  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 @@
>  	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 @@
>  		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 @@
>  	Sockbuf_IO_Desc		*sbiod;
>  };
>  
>@@ -54,3 +63,4 @@
>  #define BIO_set_init(b, x)	b->init = x
>  #define BIO_set_data(b, x)	b->ptr = x
>  #define BIO_clear_flags(b, x)	b->flags &= ~(x)
>+

Actions: View | Diff

Attachments on bug 227192: 192080 | 192655