mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-08 17:15:16 -04:00
* Enabled saving of data rate limits.
* Fixed Lost certificates issue(!) * Tweaked Tick rate parameters. * Added new chatAvailable interface fn. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@469 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a8386b454c
commit
12d3606ad4
9 changed files with 64 additions and 10 deletions
|
@ -633,16 +633,34 @@ bool AuthXPGP::SignCertificate(std::string id)
|
|||
|
||||
if (locked_FindCert(id, &cert))
|
||||
{
|
||||
XPGP_sign_certificate(pgp_keyring, cert->certificate, own->certificate);
|
||||
if (0 < validateCertificateIsSignedByKey(
|
||||
cert->certificate, own->certificate))
|
||||
{
|
||||
#ifdef AUTHXPGP_DEBUG
|
||||
std::cerr << "AuthXPGP::SignCertificate() Signed Already: " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
cert->ownsign=true;
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef AUTHXPGP_DEBUG
|
||||
std::cerr << "AuthXPGP::SignCertificate() Signing Cert: " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
/* sign certificate */
|
||||
XPGP_sign_certificate(pgp_keyring, cert->certificate, own->certificate);
|
||||
|
||||
/* reevaluate the auth of the xpgp */
|
||||
cert->trustLvl = XPGP_auth_certificate(pgp_keyring, cert->certificate);
|
||||
cert->ownsign = true;
|
||||
/* reevaluate the auth of the xpgp */
|
||||
cert->trustLvl = XPGP_auth_certificate(pgp_keyring, cert->certificate);
|
||||
cert->ownsign = true;
|
||||
|
||||
mToSaveCerts = true;
|
||||
}
|
||||
valid = true;
|
||||
|
||||
mToSaveCerts = true;
|
||||
}
|
||||
|
||||
|
||||
xpgpMtx.unlock(); /**** UNLOCK ****/
|
||||
return valid;
|
||||
}
|
||||
|
@ -751,6 +769,8 @@ bool AuthXPGP::AuthCertificate(std::string id)
|
|||
/* reevaluate the auth of the xpgp */
|
||||
cert->trustLvl = XPGP_auth_certificate(pgp_keyring, cert->certificate);
|
||||
cert->ownsign = true;
|
||||
|
||||
mToSaveCerts = true;
|
||||
}
|
||||
valid = true;
|
||||
}
|
||||
|
@ -2083,13 +2103,15 @@ bool AuthXPGP::loadCertificates(bool &oldFormat, std::map<std::string, std::s
|
|||
{
|
||||
keyValueMap[mit -> first] = mit -> second;
|
||||
}
|
||||
|
||||
mToSaveCerts = false;
|
||||
|
||||
if (keyValueMap.size() > 0)
|
||||
{
|
||||
oldFormat = true;
|
||||
mToSaveCerts = true;
|
||||
}
|
||||
|
||||
mToSaveCerts = false;
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue