From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 21 Aug 2014 14:12:54 +0000 (-0400)
Subject: Make the two branches of tor_tls_used_v1_handshake into one.
X-Git-Tag: tor-0.2.6.1-alpha~189^2~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cf229ab60b43c79289292f918f671ae6fec5da4;p=thirdparty%2Ftor.git

Make the two branches of tor_tls_used_v1_handshake into one.

(Coverity thinks that "if (a) X; else X;" is probably a bug.)

[Coverity CID 1232086]
---

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 0f989684cf..5fe8d81c59 100644
--- a/src/common/tortls.c
+++ b/src/common/tortls.c
@@ -2611,16 +2611,20 @@ check_no_tls_errors_(const char *fname, int line)
 int
 tor_tls_used_v1_handshake(tor_tls_t *tls)
 {
+#if defined(V2_HANDSHAKE_SERVER) && defined(V2_HANDSHAKE_CLIENT)
+  return ! tls->wasV2Handshake;
+#else
   if (tls->isServer) {
-#ifdef V2_HANDSHAKE_SERVER
+# ifdef V2_HANDSHAKE_SERVER
     return ! tls->wasV2Handshake;
-#endif
+# endif
   } else {
-#ifdef V2_HANDSHAKE_CLIENT
+# ifdef V2_HANDSHAKE_CLIENT
     return ! tls->wasV2Handshake;
-#endif
+# endif
   }
   return 1;
+#endif
 }
 
 /** Return true iff <b>name</b> is a DN of a kind that could only