mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

benchmarks/postal: Support DEFAULT_VERSIONS+=ssl

Browse Source 
The newest version of OpenSSL doesn't have SSLv3_method, similar to
LibreSSL, so update the patches to support both.
This commit is contained in:
John Marino 2016-11-05 14:16:28 +00:00
parent 5001d8cb7b
commit 4875e3a46b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=425391
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/postal/Makefile
View File

@ -35,6 +35,8 @@ GNUTLS_CPPFLAGS= $$(pkg-config --cflags gnutls)
GNUTLS_LDFLAGS= $$(pkg-config --libs gnutls)
OPENSSL_USE= OPENSSL=yes
OPENSSL_CONFIGURE_OFF= --disable-openssl
OPENSSL_CPPFLAGS= -I${OPENSSLINC}
OPENSSL_LDFLAGS= -L${OPENSSLLIB}
post-patch:
@${REINPLACE_CMD} -e \

10
benchmarks/postal/files/patch-basictcp.cpp
View File

@ -1,15 +1,23 @@
--- basictcp.cpp.orig 2012-01-01 11:36:27 UTC
+++ basictcp.cpp
@@ -102,10 +102,10 @@ int base_tcp::ConnectTLS()
@@ -102,10 +102,18 @@ int base_tcp::ConnectTLS()
m_sslMeth = NULL;
m_sslCtx = NULL;
m_ssl = NULL;
- m_sslMeth = SSLv2_client_method();
+#ifndef OPENSSL_NO_SSL3
+ m_sslMeth = SSLv3_client_method();
+#else
+ m_sslMeth = SSLv23_client_method();
+#endif
if(m_sslMeth == NULL)
{
- fprintf(stderr, "Can't get SSLv2_client_method.\n");
+#ifndef OPENSSL_NO_SSL3
+ fprintf(stderr, "Can't get SSLv3_client_method.\n");
+#else
+ fprintf(stderr, "Can't get SSLv23_client_method.\n");
+#endif
return 2;
}
m_sslCtx = SSL_CTX_new(m_sslMeth);

10
benchmarks/postal/files/patch-tcp.cpp
View File

@ -1,15 +1,23 @@
--- tcp.cpp.orig 2012-01-01 11:24:45 UTC
+++ tcp.cpp
@@ -178,10 +178,10 @@ int tcp::ConnectTLS()
@@ -178,10 +178,18 @@ int tcp::ConnectTLS()
#ifdef USE_OPENSSL
m_sslCtx = NULL;
m_ssl = NULL;
- m_sslMeth = SSLv2_client_method();
+#ifndef OPENSSL_NO_SSL3
+ m_sslMeth = SSLv3_client_method();
+#else
+ m_sslMeth = SSLv23_client_method();
+#endif
if(m_sslMeth == NULL)
{
- fprintf(stderr, "Can't get SSLv2_client_method.\n");
+#ifndef OPENSSL_NO_SSL3
+ fprintf(stderr, "Can't get SSLv3_client_method.\n");
+#else
+ fprintf(stderr, "Can't get SSLv23_client_method.\n");
+#endif
error();
return 2;
}