diff options
author | Bernard Normier <bernard@zeroc.com> | 2003-04-24 16:43:00 +0000 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2003-04-24 16:43:00 +0000 |
commit | 38799e58ddb78e9ada2c63694bbf54b6746f71bf (patch) | |
tree | 40ea71b972895ad06ff92b5631bc4a73bac788f6 /cpp/src/IceSSL/Context.cpp | |
parent | override Ice.Default.Locator to avoid iceboxadmin error message (diff) | |
download | ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.tar.bz2 ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.tar.xz ice-38799e58ddb78e9ada2c63694bbf54b6746f71bf.zip |
Eliminated numerous warnings from Sun C++ 5.4 builds
Diffstat (limited to 'cpp/src/IceSSL/Context.cpp')
-rw-r--r-- | cpp/src/IceSSL/Context.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/Context.cpp b/cpp/src/IceSSL/Context.cpp index 93df03dc7e0..e6240e10794 100644 --- a/cpp/src/IceSSL/Context.cpp +++ b/cpp/src/IceSSL/Context.cpp @@ -304,10 +304,7 @@ IceSSL::Context::setKeyCert(const CertificateDesc& certDesc, } else if(certDesc.getKeySize() != 0) { - const CertificateFile& privateKey = certDesc.getPrivate(); - const CertificateFile& publicKey = certDesc.getPublic(); - - addKeyCert(privateKey, publicKey); + addKeyCert(certDesc.getPrivate(), certDesc.getPublic()); } } @@ -439,7 +436,7 @@ IceSSL::Context::addKeyCert(const CertificateFile& privateKey, const Certificate if(pkLoadResult <= 0) { - int errCode = ERR_GET_REASON(ERR_peek_error()); + errCode = ERR_GET_REASON(ERR_peek_error()); // Note: Because OpenSSL currently (V0.9.6b) performs a check to see if the // key matches the private key when calling SSL_CTX_use_PrivateKey_file(). |