[tor-commits] [tor/master] Silence unused variable warnings in find_cipher_by_id

[nickm at torproject.org]

commit b3f79da0d589157948262d4a5c81969da789c0c4
Author: teor <teor2345 at gmail.com>
Date:   Wed Jun 3 03:43:46 2015 +1000

    Silence unused variable warnings in find_cipher_by_id
    
    Unused variable warnings were still generated under some versions of OpenSSL.
    Instead, make sure all variables are used under all versions.
    
    Fix on 496df21c89d1, not in any released version of tor.
---
 changes/bug16115-unused-find-cipher |    7 +++++++
 src/common/tortls.c                 |    2 ++
 2 files changed, 9 insertions(+)

diff --git a/changes/bug16115-unused-find-cipher b/changes/bug16115-unused-find-cipher
new file mode 100644
index 0000000..0f04d67
--- /dev/null
+++ b/changes/bug16115-unused-find-cipher
@@ -0,0 +1,7 @@
+  o Minor fixes (threads, comments):
+    - Silence unused variable warnings in find_cipher_by_id
+      Unused variable warnings were still generated under some versions
+      of OpenSSL. Instead, make sure all variables are used under all
+      versions of OpenSSL.
+      Patch by "teor".
+      Fix on 496df21c89d1, not in any released version of tor.
diff --git a/src/common/tortls.c b/src/common/tortls.c
index a4b6c48..70b9f0b 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -1483,6 +1483,8 @@ find_cipher_by_id(const SSL *ssl, const SSL_METHOD *m, uint16_t cipher)
   }
 #endif
   (void) ssl;
+  (void) m;
+  (void) cipher;
   return 1; /* No way to search */
 }