From 961641c18614669fd828e42b2d5ebc8874378d2f Mon Sep 17 00:00:00 2001 From: thunder2 Date: Sun, 8 Feb 2015 00:00:57 +0000 Subject: [PATCH] RetroShareLink: - 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 --- retroshare-gui/src/gui/RetroShareLink.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp index c4a3905b4..d69df38af 100644 --- a/retroshare-gui/src/gui/RetroShareLink.cpp +++ b/retroshare-gui/src/gui/RetroShareLink.cpp @@ -340,6 +340,7 @@ bool RetroShareLink::createPublicMsgInvite(time_t time_stamp,const QString& issu return valid() ; } + bool RetroShareLink::createPerson(const RsPgpId& id) { clear(); @@ -394,7 +395,7 @@ bool RetroShareLink::createUnknwonSslCertificate(const RsPeerId& sslId, const Rs } // then gpg id - if (createCertificate(sslId)) { + if (createPerson(gpgId)) { if (!_SSLid.isEmpty()) { return false; } @@ -866,6 +867,7 @@ bool RetroShareLink::checkSSLId(const QString& ssl_id) return true ; } + bool RetroShareLink::checkPGPId(const QString& pgp_id) { if(pgp_id.length() != 16) @@ -883,6 +885,7 @@ bool RetroShareLink::checkPGPId(const QString& pgp_id) return true ; } + bool RetroShareLink::checkRadix64(const QString& s) { QByteArray qb(s.toLatin1()) ; @@ -1172,7 +1175,7 @@ static void processList(const QStringList &list, const QString &textSingular, co needNotifySuccess = true; 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()) { // it's me, do nothing