Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-24 14:20:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

PQI redundant check behave the same as authssl check

Browse source
This commit is contained in:
Gioacchino Mazzurco 2019-05-14 11:43:18 +02:00
parent f9f7e0df18
commit 1599689eab
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/pqi/pqissl.cc
View file

@ -1195,7 +1195,8 @@ int pqissl::Authorise_SSL_Connection()
} }
RsPgpId pgpId = RsX509Cert::getCertIssuer(*peercert); RsPgpId pgpId = RsX509Cert::getCertIssuer(*peercert);
if( !AuthGPG::getAuthGPG()->isGPGAccepted(pgpId) ) if( pgpId != AuthGPG::getAuthGPG()->getGPGOwnId() &&
!AuthGPG::getAuthGPG()->isGPGAccepted(pgpId) )
{ {
RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId
<< " is not friend. It is very unlikely to happen at this " << " is not friend. It is very unlikely to happen at this "

3
libretroshare/src/pqi/pqissllistener.cc
View file

@ -798,7 +798,8 @@ int pqissllistener::completeConnection(int fd, IncomingSSLInfo& info)
exit(failure); exit(failure);
} }
if( !AuthGPG::getAuthGPG()->isGPGAccepted(pgpId) ) if( pgpId != AuthGPG::getAuthGPG()->getGPGOwnId() &&
!AuthGPG::getAuthGPG()->isGPGAccepted(pgpId) )
{ {
RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId RsFatal() << __PRETTY_FUNCTION__ << " pgpId: " << pgpId
<< " is not friend. It is very unlikely to happen at this " << " is not friend. It is very unlikely to happen at this "