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

fixed output/syncing of secret keyring

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5265 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-07-01 21:40:44 +00:00
parent eac2c010c3
commit 9a07328ac2
3 changed files with 49 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/pgp/pgphandler.h
View file

@ -93,8 +93,6 @@ class PGPHandler
bool privateTrustCertificate(const PGPIdType& id,int valid_level) ;
// Write keyring
bool publicKeyringChanged() const { return _pubring_changed ; }
bool secretKeyringChanged() const { return _secring_changed ; }
bool writeSecretKeyring() ;
bool writePublicKeyring() ;
@ -131,8 +129,8 @@ class PGPHandler
bool locked_writePrivateTrustDatabase() ;
bool locked_syncPublicKeyring() ;
bool locked_syncSecretKeyring() ;
bool locked_syncTrustDatabase() ;
//bool locked_syncSecretKeyring() ;
void mergeKeyringFromDisk(ops_keyring_t *keyring, std::map<std::string,PGPCertificateInfo>& kmap, const std::string& keyring_file) ;
bool addOrMergeKey(ops_keyring_t *keyring,std::map<std::string,PGPCertificateInfo>& kmap,const ops_keydata_t *keydata) ;
@ -153,8 +151,8 @@ class PGPHandler
const std::string _pgp_lock_filename ;
bool _pubring_changed ;
bool _secring_changed ;
bool _trustdb_changed ;
//bool _secring_changed ;
time_t _pubring_last_update_time ;
time_t _secring_last_update_time ;