Attachment 181002 Details for Bug 216845 – fix build of security/tor with libressl-devel

[patch] fix build of security/tor with libressl-devel

patch (text/plain), 1.68 KB, created by Matthew Rezny on 2017-03-20 15:23:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2017-03-20 15:23:15 UTC

Size: 1.68 KB

patch

obsolete

>Index: security/tor/files/patch-src_test_test__tortls.c
>===================================================================
>--- security/tor/files/patch-src_test_test__tortls.c	(nonexistent)
>+++ security/tor/files/patch-src_test_test__tortls.c	(working copy)
>@@ -0,0 +1,36 @@
>+# LibreSSL >=2.5.1 is 'OPAQUE' like OpenSSL >=1.1.0
>+# except LibreSSL 2.5.1 still has SSL_get_cipher_by_name
>+#
>+--- src/test/test_tortls.c.orig	2016-11-07 01:24:36 UTC
>++++ src/test/test_tortls.c
>+@@ -39,7 +39,8 @@ ENABLE_GCC_WARNING(redundant-decls)
>+ #define NS_MODULE tortls
>+ 
>+ #if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) \
>+-    && !defined(LIBRESSL_VERSION_NUMBER)
>++ && !defined(LIBRESSL_VERSION_NUMBER) \
>++ || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2050100fL)
>+ #define OPENSSL_OPAQUE
>+ #define SSL_STATE_STR "before SSL initialization"
>+ #else
>+@@ -740,7 +741,10 @@ test_tortls_get_ciphersuite_name(void *i
>+   tor_free(ctx->ssl);
>+   tor_free(ctx);
>+ }
>++#endif
>+ 
>++#if !defined(OPENSSL_OPAQUE) \
>++ || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2050100fL)
>+ static SSL_CIPHER *
>+ get_cipher_by_name(const char *name)
>+ {
>+@@ -757,7 +761,9 @@ get_cipher_by_name(const char *name)
>+ 
>+   return NULL;
>+ }
>++#endif
>+ 
>++#ifndef OPENSSL_OPAQUE
>+ static SSL_CIPHER *
>+ get_cipher_by_id(uint16_t id)
>+ {
>
>Property changes on: security/tor/files/patch-src_test_test__tortls.c
>___________________________________________________________________
>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:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Flags:

rezny: maintainer-approval?

Actions: View | Diff

Attachments on bug 216845: 179675 | 180050 | 181002