Cleanup of IceSSL, removal of OpenSSL namespace.

1 files changed, 12 insertions, 12 deletions

diff --git a/cpp/src/IceSSL/RSAKeyPair.cpp b/cpp/src/IceSSL/RSAKeyPair.cpp
index 2acc9c73319..a80f5403fe6 100644
--- a/cpp/src/IceSSL/RSAKeyPair.cpp
+++ b/cpp/src/IceSSL/RSAKeyPair.cpp
@@ -15,15 +15,15 @@
 #include <IceSSL/RSAPublicKey.h>
 #include <assert.h>
 
-void ::IceInternal::incRef(::IceSSL::OpenSSL::RSAKeyPair* p) { p->__incRef(); }
-void ::IceInternal::decRef(::IceSSL::OpenSSL::RSAKeyPair* p) { p->__decRef(); }
+void ::IceInternal::incRef(::IceSSL::RSAKeyPair* p) { p->__incRef(); }
+void ::IceInternal::decRef(::IceSSL::RSAKeyPair* p) { p->__decRef(); }
 
 using std::back_inserter;
 using std::string;
 using Ice::ByteSeq;
 using IceUtil::Base64;
 
-IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) :
+IceSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) :
                             _privateKey(new RSAPrivateKey(key)),
                             _publicKey(new RSAPublicKey(cert))
 {
@@ -31,7 +31,7 @@ IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const string& key, const string& cert) :
     assert(_publicKey != 0);
 }
 
-IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& certSeq) :
+IceSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& certSeq) :
                             _privateKey(new RSAPrivateKey(keySeq)),
                             _publicKey(new RSAPublicKey(certSeq))
 {
@@ -39,47 +39,47 @@ IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const ByteSeq& keySeq, const ByteSeq& ce
     assert(_publicKey != 0);
 }
 
-IceSSL::OpenSSL::RSAKeyPair::~RSAKeyPair()
+IceSSL::RSAKeyPair::~RSAKeyPair()
 {
 }
 
 void
-IceSSL::OpenSSL::RSAKeyPair::keyToBase64(string& b64Key)
+IceSSL::RSAKeyPair::keyToBase64(string& b64Key)
 {
     _privateKey->keyToBase64(b64Key);
 }
 
 void
-IceSSL::OpenSSL::RSAKeyPair::certToBase64(string& b64Cert)
+IceSSL::RSAKeyPair::certToBase64(string& b64Cert)
 {
     _publicKey->certToBase64(b64Cert);
 }
 
 void
-IceSSL::OpenSSL::RSAKeyPair::keyToByteSeq(ByteSeq& keySeq)
+IceSSL::RSAKeyPair::keyToByteSeq(ByteSeq& keySeq)
 {
     _privateKey->keyToByteSeq(keySeq);
 }
 
 void
-IceSSL::OpenSSL::RSAKeyPair::certToByteSeq(ByteSeq& certSeq)
+IceSSL::RSAKeyPair::certToByteSeq(ByteSeq& certSeq)
 {
     _publicKey->certToByteSeq(certSeq);
 }
 
 RSA*
-IceSSL::OpenSSL::RSAKeyPair::getRSAPrivateKey() const
+IceSSL::RSAKeyPair::getRSAPrivateKey() const
 {
     return _privateKey->get();
 }
 
 X509*
-IceSSL::OpenSSL::RSAKeyPair::getX509PublicKey() const
+IceSSL::RSAKeyPair::getX509PublicKey() const
 {
     return _publicKey->getX509PublicKey();
 }
 
-IceSSL::OpenSSL::RSAKeyPair::RSAKeyPair(const RSAPrivateKeyPtr& rsa, const RSAPublicKeyPtr& x509) :
+IceSSL::RSAKeyPair::RSAKeyPair(const RSAPrivateKeyPtr& rsa, const RSAPublicKeyPtr& x509) :
                             _privateKey(rsa),
                             _publicKey(x509)
 {