Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename redundant to double in guarding macros

Browse Source
This commit is contained in:
Gioacchino Mazzurco 2019-05-14 21:33:08 +02:00
parent c8082fdcc2
commit 0c097c2080
No known key found for this signature in database
GPG Key ID: A1FBCA3872E87051
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libretroshare/src/pqi/pqissl.cc
View File

@ -1151,7 +1151,7 @@ int pqissl::Authorise_SSL_Connection()
// reset switch. // reset switch.
waiting = WAITING_NOT; waiting = WAITING_NOT;
#ifdef RS_PQISSL_AUTH_REDUNDANT_CHECK #ifdef RS_PQISSL_AUTH_DOUBLE_CHECK
X509* peercert = SSL_get_peer_certificate(ssl_connection); X509* peercert = SSL_get_peer_certificate(ssl_connection);
if (!peercert) if (!peercert)
{ {
@ -1239,7 +1239,7 @@ int pqissl::accept_locked( SSL *ssl, int fd,
constexpr int failure = -1; constexpr int failure = -1;
constexpr int success = 1; constexpr int success = 1;
#ifdef RS_PQISSL_BANLIST_REDUNDANT_CHECK #ifdef RS_PQISSL_BANLIST_DOUBLE_CHECK
/* At this point, as we are actively attempting the connection, we decide /* At this point, as we are actively attempting the connection, we decide
* the address to which to connect to, banned addresses should never get * the address to which to connect to, banned addresses should never get
* here as the filtering for banned addresses happens much before, this * here as the filtering for banned addresses happens much before, this

4
libretroshare/src/pqi/pqissl.h
View File

@ -31,9 +31,9 @@
#include "pqi/pqi_base.h" #include "pqi/pqi_base.h"
#include "pqi/authssl.h" #include "pqi/authssl.h"
#define RS_PQISSL_AUTH_REDUNDANT_CHECK 1 #define RS_PQISSL_AUTH_DOUBLE_CHECK 1
#define RS_PQISSL_BANLIST_REDUNDANT_CHECK 1 #define RS_PQISSL_BANLIST_DOUBLE_CHECK 1
#define WAITING_NOT 0 #define WAITING_NOT 0

2
libretroshare/src/pqi/pqissllistener.cc
View File

@ -781,7 +781,7 @@ int pqissllistener::completeConnection(int fd, IncomingSSLInfo& info)
RsPgpId pgpId = RsX509Cert::getCertIssuer(*peercert); RsPgpId pgpId = RsX509Cert::getCertIssuer(*peercert);
RsPeerId newPeerId = RsX509Cert::getCertSslId(*peercert); RsPeerId newPeerId = RsX509Cert::getCertSslId(*peercert);
#ifdef RS_PQISSL_AUTH_REDUNDANT_CHECK #ifdef RS_PQISSL_AUTH_DOUBLE_CHECK
/* At this point the actual connection authentication has already been /* At this point the actual connection authentication has already been
* performed in AuthSSL::VerifyX509Callback, any furter authentication check * performed in AuthSSL::VerifyX509Callback, any furter authentication check
* like the following two are redundant. */ * like the following two are redundant. */

2
libretroshare/src/pqi/pqissllistener.h
View File

@ -32,7 +32,7 @@
#include "util/rsdebug.h" #include "util/rsdebug.h"
#include "pqi/pqinetwork.h" #include "pqi/pqinetwork.h"
#define RS_PQISSL_AUTH_REDUNDANT_CHECK 1 #define RS_PQISSL_AUTH_DOUBLE_CHECK 1
/***************************** pqi Net SSL Interface ********************************* /***************************** pqi Net SSL Interface *********************************
*/ */