[or-cvs] [tor/master 2/3] Correct a couple of log messages in tortls.c

[nickm@xxxxxxxxxxxxxx]

Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date: Fri, 1 Oct 2010 17:48:07 -0700
Subject: Correct a couple of log messages in tortls.c
Commit: c70d9d77ab304dd490be7bb3fefd0eeb89d37373

---
 changes/bug1994     |    6 ++++++
 src/common/tortls.c |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 changes/bug1994

diff --git a/changes/bug1994 b/changes/bug1994
new file mode 100644
index 0000000..07095aa
--- /dev/null
+++ b/changes/bug1994
@@ -0,0 +1,6 @@
+  o Minor bugfixes:
+    - Correctly describe errors that occur when generating a TLS object
+      when logging them.  Previously we would attribtue them to a failure
+      while generating a TLS context.  Bugfix by Robert Ransom.  Bugfix 
+      on 0.1.0.4-rc.
+
diff --git a/src/common/tortls.c b/src/common/tortls.c
index 25d44cc..0304045 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -930,7 +930,7 @@ tor_tls_new(int sock, int isServer)
 
   tor_assert(global_tls_context); /* make sure somebody made it first */
   if (!(result->ssl = SSL_new(global_tls_context->ctx))) {
-    tls_log_errors(NULL, LOG_WARN, LD_NET, "generating TLS context");
+    tls_log_errors(NULL, LOG_WARN, LD_NET, "creating SSL object");
     tor_free(result);
     return NULL;
   }
@@ -987,7 +987,7 @@ tor_tls_new(int sock, int isServer)
 #endif
 
   /* Not expected to get called. */
-  tls_log_errors(NULL, LOG_WARN, LD_NET, "generating TLS context");
+  tls_log_errors(NULL, LOG_WARN, LD_NET, "creating tor_tls_t object");
   return result;
 }
 
-- 
1.7.1