nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make the two branches of tor_tls_used_v1_handshake into one.

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

[Coverity CID 1232086]
This commit is contained in:
Nick Mathewson 2014-08-21 10:12:54 -04:00
parent 916fba2243
commit 2cf229ab60
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/common/tortls.c
View File

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