Attachment 180050 Details for Bug 216845 – svn diff for security/tor

[patch] svn diff for security/tor

patch-security_tor-SSL+LibreSSL-2.5.1 (text/plain), 2.26 KB, created by Bernard Spil on 2017-02-16 15:07:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bernard Spil

Created: 2017-02-16 15:07:54 UTC

Size: 2.26 KB

patch

obsolete

>Index: security/tor/Makefile
>===================================================================
>--- security/tor/Makefile	(revision 434014)
>+++ security/tor/Makefile	(working copy)
>@@ -20,7 +20,7 @@
> USES=		cpe gmake
> CPE_VENDOR=	torproject
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
>+CONFIGURE_ARGS=	--with-ssl-dir="${OPENSSLBASE}" --disable-asciidoc
> CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
> 		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
> 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"
>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,38 @@
>+Obtained from http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/ports/net/tor/patches/patch-src_test_test_tortls_c?rev=1.1&content-type=text/plain
>+
>+--- src/test/test_tortls.c.orig	2016-11-07 01:24:36 UTC
>++++ src/test/test_tortls.c
>+@@ -38,8 +38,11 @@ ENABLE_GCC_WARNING(redundant-decls)
>+ #include "log_test_helpers.h"
>+ #define NS_MODULE tortls
>+ 
>+-#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0) \
>+-    && !defined(LIBRESSL_VERSION_NUMBER)
>++#if LIBRESSL_VERSION_NUMBER >= 0x2050100fL
>++#define OPENSSL_OPAQUE
>++#endif
>++
>++#if OPENSSL_VERSION_NUMBER >= OPENSSL_V_SERIES(1,1,0)
>+ #define OPENSSL_OPAQUE
>+ #define SSL_STATE_STR "before SSL initialization"
>+ #else
>+@@ -740,7 +743,9 @@ test_tortls_get_ciphersuite_name(void *i
>+   tor_free(ctx->ssl);
>+   tor_free(ctx);
>+ }
>++#endif
>+ 
>++#if defined(OPENSSL_OPAQUE) && LIBRESSL_VERSION_NUMBER >= 0x2050100fL
>+ static SSL_CIPHER *
>+ get_cipher_by_name(const char *name)
>+ {
>+@@ -757,7 +762,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

Actions: View | Diff

Attachments on bug 216845: 179675 | 180050 | 181002