summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceSSL/CertificateDesc.cpp2
-rw-r--r--cpp/src/IceSSL/ConfigParser.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/CertificateDesc.cpp b/cpp/src/IceSSL/CertificateDesc.cpp
index cb25eb092ff..5020ee88c8d 100644
--- a/cpp/src/IceSSL/CertificateDesc.cpp
+++ b/cpp/src/IceSSL/CertificateDesc.cpp
@@ -18,7 +18,7 @@ using namespace IceSSL;
IceSSL::CertificateFile::CertificateFile() :
_fileName(""),
- _encoding(0)
+ _encoding(SSL_FILETYPE_PEM)
{
}
diff --git a/cpp/src/IceSSL/ConfigParser.cpp b/cpp/src/IceSSL/ConfigParser.cpp
index b7a7eb5fe34..6fb9630f8f8 100644
--- a/cpp/src/IceSSL/ConfigParser.cpp
+++ b/cpp/src/IceSSL/ConfigParser.cpp
@@ -421,7 +421,7 @@ IceSSL::ConfigParser::loadCertificateFile(const IceXML::NodePtr& rootNode, Certi
}
string filename;
- int encoding = 0; // Initialize, to keep the compiler from complaining.
+ int encoding = SSL_FILETYPE_PEM; // PEM is the default type.
filename = rootNode->getAttribute("filename");
if(!filename.empty())
@@ -463,13 +463,13 @@ IceSSL::ConfigParser::isAbsolutePath(string& pathString)
int
IceSSL::ConfigParser::parseEncoding(string& encodingString)
{
- int encoding = 0;
+ int encoding = SSL_FILETYPE_PEM;
- if(encodingString.compare("PEM") == 0)
+ if(encodingString == "PEM")
{
encoding = SSL_FILETYPE_PEM;
}
- else if(encodingString.compare("ASN1") == 0)
+ else if(encodingString == "ASN1")
{
encoding = SSL_FILETYPE_ASN1;
}