diff options
| author | Michi Henning <michi@zeroc.com> | 2002-07-25 23:09:48 +0000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2002-07-25 23:09:48 +0000 |
| commit | 997c78b8c2911a3787d9ca9b4b10e587cb8cbb2d (patch) | |
| tree | 267560499341128d631b40e1caff8e9435b55552 /cpp/src/IceSSL/RSACertificateGen.cpp | |
| parent | Added generation of Yellow.Query in service configuration. (diff) | |
| download | ice-997c78b8c2911a3787d9ca9b4b10e587cb8cbb2d.tar.bz2 ice-997c78b8c2911a3787d9ca9b4b10e587cb8cbb2d.tar.xz ice-997c78b8c2911a3787d9ca9b4b10e587cb8cbb2d.zip | |
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.
Diffstat (limited to 'cpp/src/IceSSL/RSACertificateGen.cpp')
| -rw-r--r-- | cpp/src/IceSSL/RSACertificateGen.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/cpp/src/IceSSL/RSACertificateGen.cpp b/cpp/src/IceSSL/RSACertificateGen.cpp index a0a21d33cad..77aaeb10b8e 100644 --- a/cpp/src/IceSSL/RSACertificateGen.cpp +++ b/cpp/src/IceSSL/RSACertificateGen.cpp @@ -301,10 +301,10 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons { IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); - certLoadEx._message = "unable to load certificate from '"; - certLoadEx._message += certFile; - certLoadEx._message += "'\n"; - certLoadEx._message += sslGetErrors(); + certLoadEx.message = "unable to load certificate from '"; + certLoadEx.message += certFile; + certLoadEx.message += "'\n"; + certLoadEx.message += sslGetErrors(); throw certLoadEx; } @@ -315,10 +315,10 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons { IceSSL::OpenSSL::CertificateLoadException certLoadEx(__FILE__, __LINE__); - certLoadEx._message = "unable to load certificate from '"; - certLoadEx._message += certFile; - certLoadEx._message += "'\n"; - certLoadEx._message += sslGetErrors(); + certLoadEx.message = "unable to load certificate from '"; + certLoadEx.message += certFile; + certLoadEx.message += "'\n"; + certLoadEx.message += sslGetErrors(); throw certLoadEx; } @@ -331,10 +331,10 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons { IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); - pklEx._message = "unable to load private key from '"; - pklEx._message += keyFile; - pklEx._message += "'\n"; - pklEx._message += sslGetErrors(); + pklEx.message = "unable to load private key from '"; + pklEx.message += keyFile; + pklEx.message += "'\n"; + pklEx.message += sslGetErrors(); throw pklEx; } @@ -345,10 +345,10 @@ IceSSL::OpenSSL::RSACertificateGen::loadKeyPair(const std::string& keyFile, cons { IceSSL::OpenSSL::PrivateKeyLoadException pklEx(__FILE__, __LINE__); - pklEx._message = "unable to load private key from '"; - pklEx._message += keyFile; - pklEx._message += "'\n"; - pklEx._message += sslGetErrors(); + pklEx.message = "unable to load private key from '"; + pklEx.message += keyFile; + pklEx.message += "'\n"; + pklEx.message += sslGetErrors(); throw pklEx; } |