Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 22:25:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Used GPGME_VALIDITY_... constants in ConfCertDialog and NetworkDialog.

Browse source 
Changed the usage of RsPeerDetails.validLvl to RsPeerDetails.trustLvl for the display in the column "Did I authenticated peer" in NetworkDialog.
Added an icon to the MessageBox of the NotifySysMessage.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-12-21 21:13:08 +00:00
parent ab42691a31
commit 312f23bd4e
7 changed files with 38 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/pqi/authgpg.cc
View file

@ -1652,7 +1652,7 @@ int AuthGPGimpl::privateRevokeCertificate(const std::string &id)
int AuthGPGimpl::privateTrustCertificate(const std::string &id, int trustlvl)
{
/* The certificate should be in Peers list ??? */
if(!isGPGAccepted(id)) {
if(!isGPGAccepted(id)) {
std::cerr << "Invalid Certificate" << std::endl;
return 0;
}

5
libretroshare/src/rsserver/p3peers.cc
View file

@ -1199,11 +1199,12 @@ bool p3Peers::trustGPGCertificate(const std::string &id, uint32_t trustlvl)
std::cerr << std::endl;
#endif
//check if we've got a ssl or gpg id
if (getGPGId(id) == "") {
std::string gpgId = getGPGId(id);
if (gpgId.empty()) {
//if no result then it must be a gpg id
return AuthGPG::getAuthGPG()->TrustCertificate(id, trustlvl);
} else {
return AuthGPG::getAuthGPG()->TrustCertificate(getGPGId(id), trustlvl);
return AuthGPG::getAuthGPG()->TrustCertificate(gpgId, trustlvl);
}
}