3 files changed, 11 insertions, 19 deletions
diff --git a/cpp/src/Glacier/CertVerifier.cpp b/cpp/src/Glacier/CertVerifier.cpp
index 0e7e059cf16..f99ee3ae277 100644
--- a/cpp/src/Glacier/CertVerifier.cpp
+++ b/cpp/src/Glacier/CertVerifier.cpp
@@ -8,8 +8,7 @@
 //
 // **********************************************************************
 
-#include <Glacier/CertVerifier.h>
-#include <Ice/SslRSAPublicKey.h>
+#include <Glacier/CertVerifier.h>
 #include <openssl/err.h>
 #include <algorithm>
 #include <iostream>
@@ -97,14 +96,9 @@ CertVerifier::verify(int preVerifyOkay, X509_STORE_CTX* x509StoreContext, SSL* s
 
 ByteSeq
 CertVerifier::toByteSeq(X509* certificate)
-{
-    IceSecurity::Ssl::OpenSSL::RSAPublicKey publicKey(certificate);
-
-    ByteSeq certByteSeq;
-    
-    publicKey.certToByteSeq(certByteSeq);
-
-/*
+{
+    ByteSeq certByteSeq;
+
     // Convert the X509 to a unsigned char buffer.
     unsigned int certSize = i2d_X509(certificate, 0);
     unsigned char* certBuffer = new unsigned char[certSize];
@@ -114,7 +108,7 @@ CertVerifier::toByteSeq(X509* certificate)
     // Yet another conversion to a ByteSeq (easy comparison this way).
     copy(certBuffer, (certBuffer + certSize), back_inserter(certByteSeq));
     delete []certBuffer;
-*/
+
     return certByteSeq;
 }
 
diff --git a/cpp/src/Ice/SslRSACertificateGen.cpp b/cpp/src/Ice/SslRSACertificateGen.cpp
index 3e85bbf58ac..b0a8ba06a08 100644
--- a/cpp/src/Ice/SslRSACertificateGen.cpp
+++ b/cpp/src/Ice/SslRSACertificateGen.cpp
@@ -58,6 +58,10 @@ IceSecurity::Ssl::OpenSSL::RSACertificateGenContext::RSACertificateGenContext()
 {
 }
 
+IceSecurity::Ssl::OpenSSL::RSACertificateGenContext::~RSACertificateGenContext()
+{
+}
+
 void
 IceSecurity::Ssl::OpenSSL::RSACertificateGenContext::setCountry(const string& country)
 {
diff --git a/cpp/test/Glacier/starter/CertVerifier.cpp b/cpp/test/Glacier/starter/CertVerifier.cpp
index 3b47af57f28..22e6f2de4a2 100644
--- a/cpp/test/Glacier/starter/CertVerifier.cpp
+++ b/cpp/test/Glacier/starter/CertVerifier.cpp
@@ -9,7 +9,6 @@
 // **********************************************************************
 
 #include <CertVerifier.h>
-#include <Ice/SslRSAPublicKey.h>
 #include <openssl/err.h>
 #include <algorithm>
 #include <iostream>
@@ -98,13 +97,8 @@ CertVerifier::verify(int preVerifyOkay, X509_STORE_CTX* x509StoreContext, SSL* s
 ByteSeq
 CertVerifier::toByteSeq(X509* certificate)
 {
-    IceSecurity::Ssl::OpenSSL::RSAPublicKey publicKey(certificate);
-
     ByteSeq certByteSeq;
-    
-    publicKey.certToByteSeq(certByteSeq);
-
-/*
+
     // Convert the X509 to a unsigned char buffer.
     unsigned int certSize = i2d_X509(certificate, 0);
     unsigned char* certBuffer = new unsigned char[certSize];
@@ -114,7 +108,7 @@ CertVerifier::toByteSeq(X509* certificate)
     // Yet another conversion to a ByteSeq (easy comparison this way).
     copy(certBuffer, (certBuffer + certSize), back_inserter(certByteSeq));
     delete []certBuffer;
-*/
+
     return certByteSeq;
 }