diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-10-24 05:51:45 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-10-24 05:51:45 +0000 |
| commit | 58e272db372e3ee1cd45badf3cf346744dcecae7 (patch) | |
| tree | bb1927b69b5a2814c10db864f1853489dd0f80f2 /cpp/src/ssl.mk | |
| parent | b2775f851a287e2bcb8ff1190eebd39df4a6a703 (diff) | |
| download | qpid-python-58e272db372e3ee1cd45badf3cf346744dcecae7.tar.gz | |
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/qpid@1401561 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/ssl.mk')
| -rw-r--r-- | cpp/src/ssl.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/cpp/src/ssl.mk b/cpp/src/ssl.mk index 4dba9bb61c..89e7ed8049 100644 --- a/cpp/src/ssl.mk +++ b/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 |