diff options
| author | Mark Spruiell <mes@zeroc.com> | 2005-01-05 17:05:42 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2005-01-05 17:05:42 +0000 |
| commit | 107171aed7a37aef9818c7891dee89efa190885e (patch) | |
| tree | 6638fc17a79379761ec080b693e58d3733e8f981 /cpp/src/IceSSL/ConfigParser.cpp | |
| parent | *** empty log message *** (diff) | |
| download | ice-107171aed7a37aef9818c7891dee89efa190885e.tar.bz2 ice-107171aed7a37aef9818c7891dee89efa190885e.tar.xz ice-107171aed7a37aef9818c7891dee89efa190885e.zip | |
fixing an encoding bug in IceSSL
Diffstat (limited to 'cpp/src/IceSSL/ConfigParser.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ConfigParser.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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; } |