Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-19 03:18:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

converted short invites to compact PGP format for increased robustness

Browse source
This commit is contained in:
csoler 2019-06-21 23:30:06 +02:00
parent e132ce7072
commit 9312d0cb3a
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
6 changed files with 187 additions and 169 deletions
Download patch file Download diff file Expand all files Collapse all files

6
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View file

@ -305,7 +305,7 @@ void ConnectFriendWizard::setCertificate(const QString &certificate, bool friend
}
}
}
else if(rsPeers->parseShortInvite(certificate.toUtf8().constData(),peerDetails))
else if(rsPeers->parseShortInvite(certificate.toUtf8().constData(),peerDetails,cert_load_error_code))
{
mIsShortInvite = true;
@ -606,7 +606,7 @@ bool ConnectFriendWizard::validateCurrentPage()
std::string certstr = ui->friendCertEdit->toPlainText().toUtf8().constData();
uint32_t cert_load_error_code;
if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_load_error_code) || rsPeers->parseShortInvite(certstr,peerDetails))
if (rsPeers->loadDetailsFromStringCert(certstr, peerDetails, cert_load_error_code) || rsPeers->parseShortInvite(certstr,peerDetails,cert_load_error_code))
{
mCertificate = certstr;
#ifdef FRIEND_WIZARD_DEBUG
@ -846,7 +846,7 @@ void ConnectFriendWizard::cleanFriendCert()
} else {
std::string cleanCert;
int error_code;
uint32_t error_code;
if (rsPeers->cleanCertificate(cert, cleanCert, mIsShortInvite, error_code))
{