From 997c78b8c2911a3787d9ca9b4b10e587cb8cbb2d Mon Sep 17 00:00:00 2001 From: Michi Henning Date: Thu, 25 Jul 2002 23:09:48 +0000 Subject: Changed Slice parser to disallow leading underscore for identifiers. Changed Slice parser to reject identifiers beginning with "Ice", unless the --ice option is used. Changed Slice parser to disallow identifiers that have a trailing "Operations", "Holder", "Helper", "Prx", or "Ptr", to avoid clashes with language mappings. Fixed tests and remaining code base to work correctly with the changed rules. --- cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp') diff --git a/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp index c2d82b52ff3..a84d0a82431 100644 --- a/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp +++ b/cpp/src/IceSSL/SslConnectionOpenSSLClient.cpp @@ -169,14 +169,14 @@ IceSSL::OpenSSL::ClientConnection::handshake(int timeout) { CertificateVerificationException certVerEx(__FILE__, __LINE__); - certVerEx._message = getVerificationError(verifyError); + certVerEx.message = getVerificationError(verifyError); string errors = sslGetErrors(); if(!errors.empty()) { - certVerEx._message += "\n"; - certVerEx._message += errors; + certVerEx.message += "\n"; + certVerEx.message += errors; } throw certVerEx; @@ -185,8 +185,8 @@ IceSSL::OpenSSL::ClientConnection::handshake(int timeout) { ProtocolException protocolEx(__FILE__, __LINE__); - protocolEx._message = "encountered a violation of the ssl protocol during handshake\n"; - protocolEx._message += sslGetErrors(); + protocolEx.message = "encountered a violation of the ssl protocol during handshake\n"; + protocolEx.message += sslGetErrors(); throw protocolEx; } @@ -329,8 +329,8 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout) ProtocolException protocolEx(__FILE__, __LINE__); // Protocol Error: Unexpected EOF - protocolEx._message = "encountered an EOF that violates the ssl protocol\n"; - protocolEx._message += sslGetErrors(); + protocolEx.message = "encountered an EOF that violates the ssl protocol\n"; + protocolEx.message += sslGetErrors(); throw protocolEx; } @@ -345,8 +345,8 @@ IceSSL::OpenSSL::ClientConnection::write(Buffer& buf, int timeout) { ProtocolException protocolEx(__FILE__, __LINE__); - protocolEx._message = "encountered a violation of the ssl protocol\n"; - protocolEx._message += sslGetErrors(); + protocolEx.message = "encountered a violation of the ssl protocol\n"; + protocolEx.message += sslGetErrors(); throw protocolEx; } -- cgit v1.2.3