forgot to remove this patch

This commit is contained in:
pascal 2017-03-03 10:02:13 +00:00
parent f16ba2d295
commit 96c3dcf531

View File

@ -1,38 +0,0 @@
$OpenBSD: patch-src_test_test_tortls_c,v 1.1 2017/01/29 16:07:52 jsing Exp $
--- src/test/test_tortls.c.orig Mon Nov 7 12:24:36 2016
+++ src/test/test_tortls.c Mon Jan 23 20:17:49 2017
@@ -38,9 +38,12 @@ 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)
+#ifdef LIBRESSL_VERSION_NUMBER
#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
#define SSL_STATE_STR "before/accept initialization"
@@ -740,7 +743,9 @@ test_tortls_get_ciphersuite_name(void *ignored)
tor_free(ctx->ssl);
tor_free(ctx);
}
+#endif
+#if defined(OPENSSL_OPAQUE) && defined(LIBRESSL_VERSION_NUMBER)
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)
{