summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceSSL/OpenSSLPluginI.cpp13
-rw-r--r--cpp/src/IceSSL/SChannelPluginI.cpp14
-rw-r--r--cpp/src/IceSSL/SecureTransportPluginI.cpp14
3 files changed, 2 insertions, 39 deletions
diff --git a/cpp/src/IceSSL/OpenSSLPluginI.cpp b/cpp/src/IceSSL/OpenSSLPluginI.cpp
index 7328dfbf41d..fe8ffec9b8c 100644
--- a/cpp/src/IceSSL/OpenSSLPluginI.cpp
+++ b/cpp/src/IceSSL/OpenSSLPluginI.cpp
@@ -25,8 +25,7 @@ public:
PluginI(const Ice::CommunicatorPtr&);
- virtual string getEngineName() const;
- virtual Ice::Long getEngineVersion() const;
+ virtual Ice::Long getOpenSSLVersion() const;
virtual IceSSL::CertificatePtr create(x509_st*) const;
virtual IceSSL::CertificatePtr load(const std::string&) const;
virtual IceSSL::CertificatePtr decode(const std::string&) const;
@@ -44,16 +43,8 @@ PluginI::PluginI(const Ice::CommunicatorPtr& com) :
{
}
-string
-PluginI::getEngineName() const
-{
- ostringstream os;
- os << "OpenSSLEngine@" << SSLeay_version(SSLEAY_VERSION);
- return os.str();
-}
-
Ice::Long
-PluginI::getEngineVersion() const
+PluginI::getOpenSSLVersion() const
{
return SSLeay();
}
diff --git a/cpp/src/IceSSL/SChannelPluginI.cpp b/cpp/src/IceSSL/SChannelPluginI.cpp
index 59cb2d11d1e..7b7abb9efa5 100644
--- a/cpp/src/IceSSL/SChannelPluginI.cpp
+++ b/cpp/src/IceSSL/SChannelPluginI.cpp
@@ -23,8 +23,6 @@ public:
PluginI(const Ice::CommunicatorPtr&);
- virtual string getEngineName() const;
- virtual Ice::Long getEngineVersion() const;
virtual IceSSL::CertificatePtr create(CERT_SIGNED_CONTENT_INFO*) const;
virtual IceSSL::CertificatePtr load(const std::string&) const;
virtual IceSSL::CertificatePtr decode(const std::string&) const;
@@ -40,18 +38,6 @@ PluginI::PluginI(const Ice::CommunicatorPtr& com) :
{
}
-string
-PluginI::getEngineName() const
-{
- return "SChannelEngine";
-}
-
-Ice::Long
-PluginI::getEngineVersion() const
-{
- return 0;
-}
-
IceSSL::CertificatePtr
PluginI::create(CERT_SIGNED_CONTENT_INFO* cert) const
{
diff --git a/cpp/src/IceSSL/SecureTransportPluginI.cpp b/cpp/src/IceSSL/SecureTransportPluginI.cpp
index 3d11563b521..6c55b28255c 100644
--- a/cpp/src/IceSSL/SecureTransportPluginI.cpp
+++ b/cpp/src/IceSSL/SecureTransportPluginI.cpp
@@ -25,8 +25,6 @@ public:
PluginI(const Ice::CommunicatorPtr&);
- virtual string getEngineName() const;
- virtual Ice::Long getEngineVersion() const;
virtual IceSSL::CertificatePtr create(SecCertificateRef) const;
virtual IceSSL::CertificatePtr load(const std::string&) const;
virtual IceSSL::CertificatePtr decode(const std::string&) const;
@@ -42,18 +40,6 @@ PluginI::PluginI(const Ice::CommunicatorPtr& com) :
{
}
-string
-PluginI::getEngineName() const
-{
- return "SecureTransport";
-}
-
-Ice::Long
-PluginI::getEngineVersion() const
-{
- return 0;
-}
-
IceSSL::CertificatePtr
PluginI::create(SecCertificateRef cert) const
{