From b62362da43bbc8d57b6c15955e5f74862569259b Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Wed, 24 Oct 2012 05:51:45 +0000 Subject: QPID-4272: Large amounts of code are duplicated between the SSL and TCP transports Refactor SslMux support simplifying it and remove need for separate SslHandler and SslIo code. Refactored SSL client code to use the same connect and broker SSL to use the same accept sequences as the TCP code. This also solves QPID-3565: IPv6 support for SSL transport on Unix C++ client/broker Remove now unneeded ssl files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1401561 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/ssl.mk | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'qpid/cpp/src/ssl.mk') diff --git a/qpid/cpp/src/ssl.mk b/qpid/cpp/src/ssl.mk index 4dba9bb61c..89e7ed8049 100644 --- a/qpid/cpp/src/ssl.mk +++ b/qpid/cpp/src/ssl.mk @@ -25,9 +25,7 @@ libsslcommon_la_SOURCES = \ qpid/sys/ssl/util.h \ qpid/sys/ssl/util.cpp \ qpid/sys/ssl/SslSocket.h \ - qpid/sys/ssl/SslSocket.cpp \ - qpid/sys/ssl/SslIo.h \ - qpid/sys/ssl/SslIo.cpp + qpid/sys/ssl/SslSocket.cpp SSLCOMMON_VERSION_INFO = 2:0:0 libsslcommon_la_LDFLAGS = -version-info $(SSLCOMMON_VERSION_INFO) @@ -37,9 +35,7 @@ libsslcommon_la_CXXFLAGS=$(AM_CXXFLAGS) $(SSL_CFLAGS) lib_LTLIBRARIES += libsslcommon.la ssl_la_SOURCES = \ - qpid/sys/SslPlugin.cpp \ - qpid/sys/ssl/SslHandler.h \ - qpid/sys/ssl/SslHandler.cpp + qpid/sys/SslPlugin.cpp ssl_la_LIBADD= libqpidbroker.la libsslcommon.la -- cgit v1.2.1