[tor-commits] [tor/release-0.2.5] Downgrade "Unexpected onionskin length after decryption" warning

[nickm at torproject.org]

commit 7a878c192f5000c5ef5d29a71924a41b6e5adf42
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Aug 29 16:38:54 2014 -0400

    Downgrade "Unexpected onionskin length after decryption" warning
    
    It's now a protocol-warn, since there's nothing relay operators can
    do about a client that sends them a malformed create cell.
    
    Resolves bug 12996; bugfix on 0.0.6rc1.
---
 changes/bug12996   |    5 +++++
 src/or/onion_tap.c |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/changes/bug12996 b/changes/bug12996
new file mode 100644
index 0000000..4b4fb0d
--- /dev/null
+++ b/changes/bug12996
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Downgrade "Unexpected onionskin length after decryption" warning
+      to a protocol-warn, since there's nothing relay operators can do
+      about a client that sends them a malformed create cell. Resolves
+      bug 12996; bugfix on 0.0.6rc1.
diff --git a/src/or/onion_tap.c b/src/or/onion_tap.c
index 9a9f374..65f8275 100644
--- a/src/or/onion_tap.c
+++ b/src/or/onion_tap.c
@@ -122,8 +122,9 @@ onion_skin_TAP_server_handshake(
              "Couldn't decrypt onionskin: client may be using old onion key");
     goto err;
   } else if (len != DH_KEY_LEN) {
-    log_warn(LD_PROTOCOL, "Unexpected onionskin length after decryption: %ld",
-             (long)len);
+    log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
+           "Unexpected onionskin length after decryption: %ld",
+           (long)len);
     goto err;
   }