diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc index becd0b910..16fd78cc9 100644 --- a/libretroshare/src/pqi/pqissl.cc +++ b/libretroshare/src/pqi/pqissl.cc @@ -1151,7 +1151,7 @@ int pqissl::Authorise_SSL_Connection() // reset switch. waiting = WAITING_NOT; -#ifdef RS_PQISSL_AUTH_REDUNDANT_CHECK +#ifdef RS_PQISSL_AUTH_DOUBLE_CHECK X509* peercert = SSL_get_peer_certificate(ssl_connection); if (!peercert) { @@ -1239,7 +1239,7 @@ int pqissl::accept_locked( SSL *ssl, int fd, constexpr int failure = -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 * the address to which to connect to, banned addresses should never get * here as the filtering for banned addresses happens much before, this diff --git a/libretroshare/src/pqi/pqissl.h b/libretroshare/src/pqi/pqissl.h index 8effae067..6246145b7 100644 --- a/libretroshare/src/pqi/pqissl.h +++ b/libretroshare/src/pqi/pqissl.h @@ -31,9 +31,9 @@ #include "pqi/pqi_base.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 diff --git a/libretroshare/src/pqi/pqissllistener.cc b/libretroshare/src/pqi/pqissllistener.cc index 894a3640e..d1a9e31a9 100644 --- a/libretroshare/src/pqi/pqissllistener.cc +++ b/libretroshare/src/pqi/pqissllistener.cc @@ -781,7 +781,7 @@ int pqissllistener::completeConnection(int fd, IncomingSSLInfo& info) RsPgpId pgpId = RsX509Cert::getCertIssuer(*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 * performed in AuthSSL::VerifyX509Callback, any furter authentication check * like the following two are redundant. */ diff --git a/libretroshare/src/pqi/pqissllistener.h b/libretroshare/src/pqi/pqissllistener.h index cf3b8c93a..42ad0d0c2 100644 --- a/libretroshare/src/pqi/pqissllistener.h +++ b/libretroshare/src/pqi/pqissllistener.h @@ -32,7 +32,7 @@ #include "util/rsdebug.h" #include "pqi/pqinetwork.h" -#define RS_PQISSL_AUTH_REDUNDANT_CHECK 1 +#define RS_PQISSL_AUTH_DOUBLE_CHECK 1 /***************************** pqi Net SSL Interface ********************************* */