Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-25 15:39:27 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

RetroShareLink:

Browse Source 
- Fixed create unknown ssl certificate
- Fixed process of person link

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2015-02-08 00:00:57 +00:00
parent ccee594a28
commit 961641c186
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
retroshare-gui/src/gui/RetroShareLink.cpp
View File

@ -340,6 +340,7 @@ bool RetroShareLink::createPublicMsgInvite(time_t time_stamp,const QString& issu
return valid() ; return valid() ;
} }
bool RetroShareLink::createPerson(const RsPgpId& id) bool RetroShareLink::createPerson(const RsPgpId& id)
{ {
clear(); clear();
@ -394,7 +395,7 @@ bool RetroShareLink::createUnknwonSslCertificate(const RsPeerId& sslId, const Rs
} }
// then gpg id // then gpg id
if (createCertificate(sslId)) { if (createPerson(gpgId)) {
if (!_SSLid.isEmpty()) { if (!_SSLid.isEmpty()) {
return false; return false;
} }
@ -866,6 +867,7 @@ bool RetroShareLink::checkSSLId(const QString& ssl_id)
return true ; return true ;
} }
bool RetroShareLink::checkPGPId(const QString& pgp_id) bool RetroShareLink::checkPGPId(const QString& pgp_id)
{ {
if(pgp_id.length() != 16) if(pgp_id.length() != 16)
@ -883,6 +885,7 @@ bool RetroShareLink::checkPGPId(const QString& pgp_id)
return true ; return true ;
} }
bool RetroShareLink::checkRadix64(const QString& s) bool RetroShareLink::checkRadix64(const QString& s)
{ {
QByteArray qb(s.toLatin1()) ; QByteArray qb(s.toLatin1()) ;
@ -1172,7 +1175,7 @@ static void processList(const QStringList &list, const QString &textSingular, co
needNotifySuccess = true; needNotifySuccess = true;
RsPeerDetails detail; RsPeerDetails detail;
if (rsPeers->getPeerDetails(RsPeerId(link.hash().toStdString()), detail)) if (rsPeers->getGPGDetails(RsPgpId(link.hash().toStdString()), detail))
{ {
if (RsPgpId(detail.gpg_id) == rsPeers->getGPGOwnId()) { if (RsPgpId(detail.gpg_id) == rsPeers->getGPGOwnId()) {
// it's me, do nothing // it's me, do nothing