[#1661] Addressed some 1661 comments (port)

diff --git a/src/lib/asiolink/openssl_tls.h b/src/lib/asiolink/openssl_tls.h
index b87603621024164362b0afd087096660ad6f448c..b5a83eb1f4ecb911eed00af24e603e102958832a 100644 (file)
--- a/src/lib/asiolink/openssl_tls.h
+++ b/src/lib/asiolink/openssl_tls.h
@@ -236,6 +236,21 @@ typedef boost::asio::ssl::stream<boost::asio::ip::tcp::socket> TlsStreamImpl;
 /// @brief The type of X509 certificates.
 typedef ::X509 TlsCertificate;
 
+<<<<<<< HEAD
+=======
+/// @brief TlsStreamBase constructor.
+///
+/// @param Callback The type of callbacks.
+/// @param TlsStreamImpl The type of underlying TLS streams.
+/// @param TlsCertificate The type of X509 certificates.
+template <typename Callback, typename TlsStreamImpl, typename TlsCertificate>
+TlsStreamBase<Callback, TlsStreamImpl, TlsCertificate>::
+TlsStreamBase(IOService& service, TlsContextPtr context)
+    : TlsStreamImpl(service.get_io_service(), context->getContext()),
+      role_(context->getRole()) {
+}
+
+>>>>>>> [#1661] Addressed some 1661 comments (port)
 /// @brief OpenSSL TLS stream.
 ///
 /// @param callback The callback.
@@ -264,12 +279,16 @@ public:
     ///
     /// @param callback Callback object.
     virtual void handshake(Callback& callback) {
+<<<<<<< HEAD
         using namespace boost::asio::ssl;
         if (role_ == SERVER) {
             async_handshake(stream_base::server, callback);
         } else {
             async_handshake(stream_base::client, callback);
         }
+=======
+        Base::async_handshake(roleToImpl(Base::getRole()), callback);
+>>>>>>> [#1661] Addressed some 1661 comments (port)
     }
 
     /// @brief TLS shutdown.
@@ -295,6 +314,9 @@ public:
     TlsRole role_;
 };
 
+// Stream truncated error code.
+const int STREAM_TRUNCATED = boost::asio::ssl::error::stream_truncated;
+
 } // namespace asiolink
 } // namespace isc
 

diff --git a/src/lib/asiolink/testutils/Makefile.am b/src/lib/asiolink/testutils/Makefile.am
index 075e7211c853ae2c1e3cbd6a14bcb701730111ca..0895b80a953cca14436a44ecedc4dc82a3effa66 100644 (file)
--- a/src/lib/asiolink/testutils/Makefile.am
+++ b/src/lib/asiolink/testutils/Makefile.am
@@ -64,6 +64,7 @@ noinst_PROGRAMS = openssl_sample_client openssl_sample_server
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 openssl_sample_client_SOURCES = openssl_sample_client.cc
 openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_client_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
@@ -89,18 +90,17 @@ openssl_sample_client_SOURCES = openssl_sample_client.cc
 =======
 openssl_sample_client_SOURCES = openssl_sample_client.cpp
 >>>>>>> [#1661] Renamed samples
+=======
+openssl_sample_client_SOURCES = openssl_sample_client.cc
+>>>>>>> [#1661] Addressed some 1661 comments (port)
 openssl_sample_client_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_client_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 openssl_sample_client_LDADD = $(CRYPTO_LIBS)
 
-openssl_sample_server_SOURCES = openssl_sample_server.cpp
+openssl_sample_server_SOURCES = openssl_sample_server.cc
 openssl_sample_server_CPPFLAGS = $(AM_CPPFLAGS)
 openssl_sample_server_LDFLAGS = $(AM_LDFLAGS) $(CRYPTO_LDFLAGS)
 openssl_sample_server_LDADD = $(CRYPTO_LIBS)
 >>>>>>> [#1661] Moved to cpp03 server example
 endif
 endif
-
-
-
-

diff --git a/src/lib/asiolink/testutils/openssl_sample_client.cpp b/src/lib/asiolink/testutils/openssl_sample_client.cc
similarity index 100%
rename from src/lib/asiolink/testutils/openssl_sample_client.cpp
rename to src/lib/asiolink/testutils/openssl_sample_client.cc

diff --git a/src/lib/asiolink/testutils/openssl_sample_server.cpp b/src/lib/asiolink/testutils/openssl_sample_server.cc
similarity index 100%
rename from src/lib/asiolink/testutils/openssl_sample_server.cpp
rename to src/lib/asiolink/testutils/openssl_sample_server.cc