Added PrivateKeyException to the addKeyCert methods to ensure that the

    blank private key problem was taken care of.

1 files changed, 18 insertions, 0 deletions

diff --git a/cpp/src/Ice/ContextOpenSSL.cpp b/cpp/src/Ice/ContextOpenSSL.cpp
index b301d1c4ff4..b0cc0e2f543 100644
--- a/cpp/src/Ice/ContextOpenSSL.cpp
+++ b/cpp/src/Ice/ContextOpenSSL.cpp
@@ -69,12 +69,30 @@ void
 IceSSL::OpenSSL::Context::setRSAKeysBase64(const std::string& privateKey,
                                            const std::string& publicKey)
 {
+    if (privateKey.empty())
+    {
+        IceSSL::PrivateKeyException privateKeyEx(__FILE__, __LINE__);
+
+        privateKeyEx._message = "Empty private key supplied.";
+
+        throw privateKeyEx;
+    }
+
     addKeyCert(privateKey, publicKey);
 }
 
 void
 IceSSL::OpenSSL::Context::setRSAKeys(const Ice::ByteSeq& privateKey, const Ice::ByteSeq& publicKey)
 {
+    if (privateKey.empty())
+    {
+        IceSSL::PrivateKeyException privateKeyEx(__FILE__, __LINE__);
+
+        privateKeyEx._message = "Empty private key supplied.";
+
+        throw privateKeyEx;
+    }
+
     addKeyCert(privateKey, publicKey);
 }