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

change mutex lock in authgpg to avoid deadlock

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2028 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-01-13 21:34:47 +00:00
parent c45582738e
commit 38df8b54a6
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/pqi/authgpg.cc
View File

@ -1326,8 +1326,6 @@ bool AuthGPG::VerifySignBin(const void *data, uint32_t datalen, unsigned char *s
int AuthGPG::privateSignCertificate(std::string id) int AuthGPG::privateSignCertificate(std::string id)
{ {
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
/* The key should be in Others list and not in Peers list ?? /* The key should be in Others list and not in Peers list ??
* Once the key is signed, it moves from Others to Peers list ??? * Once the key is signed, it moves from Others to Peers list ???
*/ */
@ -1360,7 +1358,9 @@ int AuthGPG::privateSignCertificate(std::string id)
return 0; return 0;
} }
/* Should I move the certificate from Others to Peers ??? */ RsStackMutex stack(pgpMtx); /******* LOCKED ******/
storeAllKeys_locked();
return 1; return 1;
} }
@ -1375,10 +1375,7 @@ int AuthGPG::privateRevokeCertificate(std::string id)
int AuthGPG::privateTrustCertificate(std::string id, int trustlvl) int AuthGPG::privateTrustCertificate(std::string id, int trustlvl)
{ {
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
/* The certificate should be in Peers list ??? */ /* The certificate should be in Peers list ??? */
if(!isGPGSigned(id)) { if(!isGPGSigned(id)) {
std::cerr << "Invalid Certificate" << std::endl; std::cerr << "Invalid Certificate" << std::endl;
return 0; return 0;
@ -1402,6 +1399,7 @@ int AuthGPG::privateTrustCertificate(std::string id, int trustlvl)
//the key ref has changed, we got to get rid of the old reference. //the key ref has changed, we got to get rid of the old reference.
trustCert.key = NULL; trustCert.key = NULL;
RsStackMutex stack(pgpMtx); /******* LOCKED ******/
storeAllKeys_locked(); storeAllKeys_locked();
return 1; return 1;