Changeset 2090

Timestamp:

07/02/2008 17:37:00 (11 months ago)

Author:

chris

Message:

Improve error messages when loading SSL key files fails.

Location:

box/trunk/lib/server

Files:

• SSLLib.cpp (modified) (2 diffs)
• SSLLib.h (modified) (1 diff)
• SocketStreamTLS.cpp (modified) (6 diffs)
• TLSContext.cpp (modified) (3 diffs)

box/trunk/lib/server/SSLLib.cpp

@@ -64 +64 @@
 //
 // --------------------------------------------------------------------------
-void SSLLib::LogError(const char *ErrorDuringAction)
+void SSLLib::LogError(const std::string& rErrorDuringAction)
 {
         unsigned long errcode;
@@ -71 +71 @@
         {
                 ::ERR_error_string_n(errcode, errname, sizeof(errname));
-                BOX_ERROR("SSL error during " << ErrorDuringAction << ": " <<
+                BOX_ERROR("SSL error while " << rErrorDuringAction << ": " <<
                         errname);
         }

box/trunk/lib/server/SSLLib.h

@@ -30 +30 @@
 {
         void Initialise();
-        void LogError(const char *ErrorDuringAction);
+        void LogError(const std::string& rErrorDuringAction);
 };
 

box/trunk/lib/server/SocketStreamTLS.cpp

@@ -124 +124 @@
         if(mpBIO == 0)
         {
-                SSLLib::LogError("Create socket bio");
+                SSLLib::LogError("creating socket bio");
                 THROW_EXCEPTION(ServerException, TLSAllocationFailed)
         }
@@ -135 +135 @@
         if(mpSSL == 0)
         {
-                SSLLib::LogError("Create ssl");
+                SSLLib::LogError("creating SSL object");
                 THROW_EXCEPTION(ServerException, TLSAllocationFailed)
         }
@@ -203 +203 @@
                         if(IsServer)
                         {
-                                SSLLib::LogError("Accept");
+                                SSLLib::LogError("accepting connection");
                                 THROW_EXCEPTION(ConnectionException, Conn_TLSHandshakeFailed)
                         }
                         else
                         {
-                                SSLLib::LogError("Connect");
+                                SSLLib::LogError("connecting");
                                 THROW_EXCEPTION(ConnectionException, Conn_TLSHandshakeFailed)
                         }
@@ -335 +335 @@
                         
                 default:
-                        SSLLib::LogError("Read");
+                        SSLLib::LogError("reading");
                         THROW_EXCEPTION(ConnectionException, Conn_TLSReadFailed)
                         break;
@@ -400 +400 @@
                 
                 default:
-                        SSLLib::LogError("Write");
+                        SSLLib::LogError("writing");
                         THROW_EXCEPTION(ConnectionException, Conn_TLSWriteFailed)
                         break;
@@ -442 +442 @@
         if(::SSL_shutdown(mpSSL) < 0)
         {
-                SSLLib::LogError("Shutdown");
+                SSLLib::LogError("shutting down");
                 THROW_EXCEPTION(ConnectionException, Conn_TLSShutdownFailed)
         }

box/trunk/lib/server/TLSContext.cpp

@@ -76 +76 @@
         if(::SSL_CTX_use_certificate_chain_file(mpContext, CertificatesFile) != 1)
         {
-                SSLLib::LogError("Load certificates");
+                std::string msg = "loading certificates from ";
+                msg += CertificatesFile;
+                SSLLib::LogError(msg);
                 THROW_EXCEPTION(ServerException, TLSLoadCertificatesFailed)
         }
         if(::SSL_CTX_use_PrivateKey_file(mpContext, PrivateKeyFile, SSL_FILETYPE_PEM) != 1)
         {
-                SSLLib::LogError("Load private key");
+                std::string msg = "loading private key from ";
+                msg += PrivateKeyFile;
+                SSLLib::LogError(msg);
                 THROW_EXCEPTION(ServerException, TLSLoadPrivateKeyFailed)
         }
@@ -88 +92 @@
         if(::SSL_CTX_load_verify_locations(mpContext, TrustedCAsFile, NULL) != 1)
         {
-                SSLLib::LogError("Load CA cert");
+                std::string msg = "loading CA cert from ";
+                msg += TrustedCAsFile;
+                SSLLib::LogError(msg);
                 THROW_EXCEPTION(ServerException, TLSLoadTrustedCAsFailed)
         }
@@ -100 +106 @@
         if(::SSL_CTX_set_cipher_list(mpContext, CIPHER_LIST) != 1)
         {
-                SSLLib::LogError("Set cipher list");
+                SSLLib::LogError("setting cipher list to " CIPHER_LIST);
                 THROW_EXCEPTION(ServerException, TLSSetCiphersFailed)
         }