[tor-commits] [tor/master] Make the two branches of tor_tls_used_v1_handshake into one.

[nickm at torproject.org]

commit 2cf229ab60b43c79289292f918f671ae6fec5da4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 21 10:12:54 2014 -0400

    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]
---
 src/common/tortls.c |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/common/tortls.c b/src/common/tortls.c
index 0f98968..5fe8d81 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