Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-03-01 19:31:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved display/fixed bugs in security item

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-01-16 19:57:08 +00:00
parent 6fa0d894d0
commit bbdc978d00
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/pqi/authssl.cc
View File

@ -1407,7 +1407,15 @@ bool AuthSSLimpl::FailedCertificate(X509 *x509, const std::string& gpgid,
rs_sprintf_append(ip_address, "%s:%u", rs_inet_ntoa(addr.sin_addr).c_str(), ntohs(addr.sin_port)); rs_sprintf_append(ip_address, "%s:%u", rs_inet_ntoa(addr.sin_addr).c_str(), ntohs(addr.sin_port));
uint32_t auth_diagnostic = 0 ; uint32_t auth_diagnostic = 0 ;
bool authed = (x509 != NULL && AuthX509WithGPG(x509,auth_diagnostic)) ; bool authed ;
if(x509 == NULL)
{
auth_diagnostic = RS_SSL_HANDSHAKE_DIAGNOSTIC_CERTIFICATE_NOT_VALID ;
authed = false ;
}
else
authed = AuthX509WithGPG(x509,auth_diagnostic) ;
if(authed) if(authed)
LocalStoreCert(x509); LocalStoreCert(x509);

3
retroshare-gui/src/gui/NewsFeed.cpp
View File

@ -145,6 +145,9 @@ void NewsFeed::updateDisplay()
break; break;
case RS_FEED_ITEM_SEC_CONNECT_ATTEMPT: case RS_FEED_ITEM_SEC_CONNECT_ATTEMPT:
case RS_FEED_ITEM_SEC_WRONG_SIGNATURE:
case RS_FEED_ITEM_SEC_BAD_CERTIFICATE:
case RS_FEED_ITEM_SEC_INTERNAL_ERROR:
if (Settings->getMessageFlags() & RS_MESSAGE_CONNECT_ATTEMPT) { if (Settings->getMessageFlags() & RS_MESSAGE_CONNECT_ATTEMPT) {
MessageComposer::sendConnectAttemptMsg(fi.mId1, fi.mId2, QString::fromUtf8(fi.mId3.c_str())); MessageComposer::sendConnectAttemptMsg(fi.mId1, fi.mId2, QString::fromUtf8(fi.mId3.c_str()));
} }

2
retroshare-gui/src/gui/feeds/SecurityItem.cpp
View File

@ -131,7 +131,7 @@ void SecurityItem::updateItemStatic()
requestLabel->hide(); requestLabel->hide();
break; break;
case RS_FEED_ITEM_SEC_BAD_CERTIFICATE: case RS_FEED_ITEM_SEC_BAD_CERTIFICATE:
title = tr("Certificate is invalid."); title = tr("Certificate is invalid. This peer is probably not who he claims to be.");
requestLabel->hide(); requestLabel->hide();
break; break;
case RS_FEED_ITEM_SEC_INTERNAL_ERROR: case RS_FEED_ITEM_SEC_INTERNAL_ERROR: