From fd1d3cf60e55950372306e9afca1cb9851965c33 Mon Sep 17 00:00:00 2001 From: Tomasz Niedziela-Brach Date: Wed, 13 Jul 2016 08:04:38 +0200 Subject: [PATCH 1/2] making methods protected to allow overriding default behaviour of OpenSSLContext within derived classes --- .../src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h index 029edbbac..b050915f0 100644 --- a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h +++ b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h @@ -66,7 +66,7 @@ namespace openssl { */ virtual decaf::net::ServerSocketFactory* providerGetServerSocketFactory(); - private: + protected: friend class OpenSSLSocket; friend class OpenSSLSocketFactory; From 4af9d03a98ed648ebf64fcc20d0d9f445c45e495 Mon Sep 17 00:00:00 2001 From: Tomasz Niedziela-Brach Date: Wed, 13 Jul 2016 08:24:31 +0200 Subject: [PATCH 2/2] making only getOpenSSLCtx() protected --- .../main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h index b050915f0..164a5b535 100644 --- a/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h +++ b/activemq-cpp/src/main/decaf/internal/net/ssl/openssl/OpenSSLContextSpi.h @@ -66,13 +66,15 @@ namespace openssl { */ virtual decaf::net::ServerSocketFactory* providerGetServerSocketFactory(); - protected: + private: friend class OpenSSLSocket; friend class OpenSSLSocketFactory; std::vector getDefaultCipherSuites(); std::vector getSupportedCipherSuites(); + + protected: void* getOpenSSLCtx(); };