casa-mp-base

--- libraries/libldap/tls_o.c   2018-04-02 13:20:34.000000000 -0700

+++ libraries/libldap/tls_o.c   2018-04-02 13:24:49.000000000 -0700

@@ -47,7 +47,7 @@

 #include <ssl.h>

 #endif

-#if OPENSSL_VERSION_NUMBER >= 0x10100000

+#if OPENSSL_VERSION_NUMBER >= 0x10100000 || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000)

 #define ASN1_STRING_data(x)    ASN1_STRING_get0_data(x)

 #endif

@@ -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 < 0x2070000)

 /*

  * 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

-#if OPENSSL_VERSION_NUMBER < 0x10100000

+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)

    SSL_load_error_strings();

    SSL_library_init();

    OpenSSL_add_all_digests();

@@ -249,7 +249,7 @@ static void

 tlso_ctx_ref( tls_ctx *ctx )

 {

    tlso_ctx *c = (tlso_ctx *)ctx;

-#if OPENSSL_VERSION_NUMBER < 0x10100000

+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)

 #define    SSL_CTX_up_ref(ctx) CRYPTO_add( &(ctx->references), 1, CRYPTO_LOCK_SSL_CTX )

 #endif

    SSL_CTX_up_ref( c );

@@ -508,7 +508,7 @@ tlso_session_my_dn( tls_session *sess, s

    if (!x) return LDAP_INVALID_CREDENTIALS;

    xn = X509_get_subject_name(x);

-#if OPENSSL_VERSION_NUMBER < 0x10100000

+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)

    der_dn->bv_len = i2d_X509_NAME( xn, NULL );

    der_dn->bv_val = xn->bytes->data;

 #else

@@ -544,7 +544,7 @@ tlso_session_peer_dn( tls_session *sess,

        return LDAP_INVALID_CREDENTIALS;

    xn = X509_get_subject_name(x);

-#if OPENSSL_VERSION_NUMBER < 0x10100000

+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)

    der_dn->bv_len = i2d_X509_NAME( xn, NULL );

    der_dn->bv_val = xn->bytes->data;

 #else

@@ -765,7 +765,7 @@ struct tls_data {

    Sockbuf_IO_Desc     *sbiod;

 };

-#if OPENSSL_VERSION_NUMBER < 0x10100000

+#if (OPENSSL_VERSION_NUMBER < 0x10100000) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000)

 #define BIO_set_init(b, x) b->init = x