[tor-commits] [tor/maint-0.3.4] Improve connection auth logging

[nickm@xxxxxxxxxxxxxx]

commit 859d5a737502258641703cb52598b64bd08ce870
Author: teor <teor@xxxxxxxxxxxxxx>
Date:   Wed Jul 25 14:39:31 2018 +1000

    Improve connection auth logging
    
    Improve the log message when connection initiators fail to authenticate
    direct connections to relays.
    
    Fixes bug 26927; bugfix on 0.3.0.1-alpha.
---
 changes/bug26927       | 4 ++++
 src/or/connection_or.c | 8 ++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/changes/bug26927 b/changes/bug26927
new file mode 100644
index 000000000..cd035bba8
--- /dev/null
+++ b/changes/bug26927
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Improve the log message when connection initiators fail to authenticate
+      direct connections to relays.
+      Fixes bug 26927; bugfix on 0.3.0.1-alpha.
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index add0493d2..fe2cea4f4 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1708,8 +1708,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
     }
 
     log_fn(severity, LD_HANDSHAKE,
-           "Tried connecting to router at %s:%d, but RSA identity key was not "
-           "as expected: wanted %s + %s but got %s + %s.%s",
+           "Tried connecting to router at %s:%d, but RSA + ed25519 identity "
+           "keys were not as expected: wanted %s + %s but got %s + %s.%s",
            conn->base_.address, conn->base_.port,
            expected_rsa, expected_ed, seen_rsa, seen_ed, extra_log);
 
@@ -1726,8 +1726,8 @@ connection_or_client_learned_peer_id(or_connection_t *conn,
   }
 
   if (!expected_ed_key && ed_peer_id) {
-    log_info(LD_HANDSHAKE, "(we had no Ed25519 ID in mind when we made this "
-             "connection.");
+    log_info(LD_HANDSHAKE, "(We had no Ed25519 ID in mind when we made this "
+             "connection.)");
     connection_or_set_identity_digest(conn,
                                       (const char*)rsa_peer_id, ed_peer_id);
     changed_identity = 1;



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits