summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/GeneralConfig.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceSSL/GeneralConfig.cpp')
-rw-r--r--cpp/src/IceSSL/GeneralConfig.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/cpp/src/IceSSL/GeneralConfig.cpp b/cpp/src/IceSSL/GeneralConfig.cpp
index 541614d8ad4..f33230c0455 100644
--- a/cpp/src/IceSSL/GeneralConfig.cpp
+++ b/cpp/src/IceSSL/GeneralConfig.cpp
@@ -68,27 +68,27 @@ IceSSL::GeneralConfig::getRandomBytesFiles() const
void
IceSSL::GeneralConfig::set(string& name, string& value)
{
- if (name.compare("version") == 0)
+ if(name.compare("version") == 0)
{
parseVersion(value);
}
- else if (name.compare("cipherlist") == 0)
+ else if(name.compare("cipherlist") == 0)
{
_cipherList = value;
}
- else if (name.compare("context") == 0)
+ else if(name.compare("context") == 0)
{
_context = value;
}
- else if (name.compare("verifymode") == 0)
+ else if(name.compare("verifymode") == 0)
{
parseVerifyMode(value);
}
- else if (name.compare("verifydepth") == 0)
+ else if(name.compare("verifydepth") == 0)
{
_verifyDepth = atoi(value.c_str());
}
- else if (name.compare("randombytes") == 0)
+ else if(name.compare("randombytes") == 0)
{
_randomBytesFiles = value;
}
@@ -102,19 +102,19 @@ IceSSL::GeneralConfig::set(string& name, string& value)
void
IceSSL::GeneralConfig::parseVersion(string& value)
{
- if (value.compare("SSLv2") == 0)
+ if(value.compare("SSLv2") == 0)
{
_sslVersion = SSL_V2;
}
- else if (value.compare("SSLv23") == 0)
+ else if(value.compare("SSLv23") == 0)
{
_sslVersion = SSL_V23;
}
- else if (value.compare("SSLv3") == 0)
+ else if(value.compare("SSLv3") == 0)
{
_sslVersion = SSL_V3;
}
- else if (value.compare("TLSv1") == 0)
+ else if(value.compare("TLSv1") == 0)
{
_sslVersion = TLS_V1;
}
@@ -133,37 +133,37 @@ IceSSL::GeneralConfig::parseVerifyMode(string& value)
string::size_type beg;
string::size_type end = 0;
- while (true)
+ while(true)
{
beg = s.find_first_not_of(delim, end);
- if (beg == string::npos)
+ if(beg == string::npos)
{
break;
}
end = s.find_first_of(delim, beg);
- if (end == string::npos)
+ if(end == string::npos)
{
end = s.length();
}
string option = s.substr(beg, end - beg);
- if (option.compare("none") == 0)
+ if(option.compare("none") == 0)
{
_verifyMode |= SSL_VERIFY_NONE;
}
- else if (option.compare("peer") == 0)
+ else if(option.compare("peer") == 0)
{
_verifyMode |= SSL_VERIFY_PEER;
}
- else if (option.compare("fail_no_cert") == 0)
+ else if(option.compare("fail_no_cert") == 0)
{
_verifyMode |= SSL_VERIFY_FAIL_IF_NO_PEER_CERT;
}
- else if (option.compare("client_once") == 0)
+ else if(option.compare("client_once") == 0)
{
_verifyMode |= SSL_VERIFY_CLIENT_ONCE;
}
@@ -171,7 +171,7 @@ IceSSL::GeneralConfig::parseVerifyMode(string& value)
// Both SSL_VERIFY_FAIL_IF_NO_PEER_CERT and SSL_VERIFY_CLIENT_ONCE require
// that SSL_VERIFY_PEER be set, otherwise it's an error.
- if ((_verifyMode != SSL_VERIFY_NONE) && !(_verifyMode & SSL_VERIFY_PEER))
+ if((_verifyMode != SSL_VERIFY_NONE) && !(_verifyMode & SSL_VERIFY_PEER))
{
_verifyMode = SSL_VERIFY_NONE;
}