From: teor <teor2345@gmail.com>
Date: Tue, 2 Jun 2015 17:43:46 +0000 (+1000)
Subject: Silence unused variable warnings in find_cipher_by_id
X-Git-Tag: tor-0.2.7.2-alpha~101^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3f79da0d589157948262d4a5c81969da789c0c4;p=thirdparty%2Ftor.git

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.
---

diff --git a/changes/bug16115-unused-find-cipher b/changes/bug16115-unused-find-cipher
new file mode 100644
index 0000000000..0f04d6795b
--- /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 a4b6c487fe..70b9f0b240 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 */
 }