diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceSSL/SChannelEngine.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportEngine.cpp | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index e0aa2bc216e..71b6f5882cd 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -124,8 +124,8 @@ parseProtocols(const StringSeq& protocols) return v; } -const ALG_ID supportedChipers[] = { CALG_3DES, CALG_AES_128, CALG_AES_256, CALG_DES, CALG_RC2, CALG_RC4 }; -const int supportedChipersSize = sizeof(supportedChipers)/sizeof(ALG_ID); +const ALG_ID supportedCiphers[] = { CALG_3DES, CALG_AES_128, CALG_AES_256, CALG_DES, CALG_RC2, CALG_RC4 }; +const int supportedCiphersSize = sizeof(supportedCiphers)/sizeof(ALG_ID); ALG_ID algorithmId(const string& name) @@ -208,9 +208,9 @@ SChannelEngine::initialize() os << "enabling SSL ciphersuites:"; if(_ciphers.empty()) { - for(int i = 0; i < supportedChipersSize; ++i) + for(int i = 0; i < supportedCiphersSize; ++i) { - os << "\n " << getCipherName(supportedChipers[i]); + os << "\n " << getCipherName(supportedCiphers[i]); } } else diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 00d4611a017..9e023ac0ab7 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1293,7 +1293,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming) if(_chain && (err = SSLSetCertificate(ssl, _chain))) { throw SecurityException(__FILE__, __LINE__, - "IceSSL: error while set the SSL context certificate:\n" + errorToString(err)); + "IceSSL: error while setting the SSL context certificate:\n" + errorToString(err)); } @@ -1301,7 +1301,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming) { if((err = SSLSetEnabledCiphers(ssl, &_ciphers[0], _ciphers.size()))) { - throw SecurityException(__FILE__, __LINE__, "IceSSL: error while set ciphers:\n" + errorToString(err)); + throw SecurityException(__FILE__, __LINE__, "IceSSL: error while setting ciphers:\n" + errorToString(err)); } } @@ -1309,7 +1309,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming) kSSLSessionOptionBreakOnServerAuth, true))) { - throw SecurityException(__FILE__, __LINE__, "IceSSL: error while set SSL option:\n" + errorToString(err)); + throw SecurityException(__FILE__, __LINE__, "IceSSL: error while setting SSL option:\n" + errorToString(err)); } if(_protocolVersionMax != kSSLProtocolUnknown) @@ -1317,7 +1317,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming) if((err = SSLSetProtocolVersionMax(ssl, _protocolVersionMax))) { throw SecurityException(__FILE__, __LINE__, - "IceSSL: error while set SSL protocol version max:\n" + errorToString(err)); + "IceSSL: error while setting SSL protocol version max:\n" + errorToString(err)); } } @@ -1326,7 +1326,7 @@ IceSSL::SecureTransportEngine::newContext(bool incoming) if((err = SSLSetProtocolVersionMin(ssl, _protocolVersionMin))) { throw SecurityException(__FILE__, __LINE__, - "IceSSL: error while set SSL protocol version min:\n" + errorToString(err)); + "IceSSL: error while setting SSL protocol version min:\n" + errorToString(err)); } } |