freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

net/Sockets: USES+=ssl, Fix SSLv3, set CFLAGS, honor LDFLAGS

Browse Source 
Approved by:	SSL blanket
This commit is contained in:
John Marino
2016-09-09 13:05:53 +00:00
parent 2aa35097e2
commit 193b3617c0
3 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/Sockets/Makefile
View File

@@ -18,10 +18,11 @@ COMMENT= C++ wrapper for BSD-style sockets
#CFLAGS+= -I${LOCALBASE}/include
#LDFLAGS+= -L${LOCALBASE}/lib
USES+= gmake
USES+= gmake ssl
USE_GNOME= libxml2
USE_OPENSSL= yes
USE_LDCONFIG= yes
CFLAGS+= -I${OPENSSLINC}
LDFLAGS+= -L${OPENSSLLIB}
ALL_TARGET= all shared
INSTALL_TARGET= install_shared

3
net/Sockets/files/Makefile.Defines.freebsd
View File

@@ -9,6 +9,7 @@ CFLAGS += -fPIC
OBJS += Semaphore.o
LDFLAGSSO = -shared \
LDFLAGSSO = $(LDFLAGS) \
-shared \
-Wl,-lssl \
-Wl,-h$(SONAME)

20
net/Sockets/files/patch-TcpSocket.cpp Normal file
View File

@@ -0,0 +1,20 @@
--- TcpSocket.cpp.orig 2012-09-08 06:47:13 UTC
+++ TcpSocket.cpp
@@ -1283,7 +1283,7 @@ void TcpSocket::InitializeContext(const
/* Create our context*/
if (m_client_contexts.find(context) == m_client_contexts.end())
{
- const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
+ const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
m_ssl_ctx = m_client_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
}
@@ -1339,7 +1339,7 @@ void TcpSocket::InitializeContext(const
/* Create our context*/
if (m_server_contexts.find(context) == m_server_contexts.end())
{
- const SSL_METHOD *meth = meth_in ? meth_in : SSLv3_method();
+ const SSL_METHOD *meth = meth_in ? meth_in : SSLv23_method();
m_ssl_ctx = m_server_contexts[context] = SSL_CTX_new(const_cast<SSL_METHOD *>(meth));
SSL_CTX_set_mode(m_ssl_ctx, SSL_MODE_AUTO_RETRY|SSL_MODE_ENABLE_PARTIAL_WRITE);
// session id