[tor-commits] [stegotorus/master] Accept and ignore --server-key

[zwol at torproject.org]

commit e3a7a80ff7666f836b921c343ef8bf28ffe886f6
Author: Zack Weinberg <zackw at cmu.edu>
Date:   Tue Jun 12 17:48:56 2012 -0400

    Accept and ignore --server-key
---
 src/protocol/chop.cc |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/protocol/chop.cc b/src/protocol/chop.cc
index f547303..67ed2b3 100644
--- a/src/protocol/chop.cc
+++ b/src/protocol/chop.cc
@@ -428,6 +428,13 @@ chop_config_t::init(int n_options, const char *const *options)
   } else
     goto usage;
 
+  // if in client mode, accept and ignore --server-key=
+  if (mode != LSN_SIMPLE_SERVER &&
+      !strncmp(options[1], "--server-key=", 13)) {
+    options++;
+    n_options--;
+  }
+
   up_address = resolve_address_port(options[1], 1, listen_up, defport);
   if (!up_address) {
     log_warn("chop: invalid up address: %s", options[1]);