Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

make the gpg key list reading a little more error proof

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2010-03-02 22:35:49 +00:00
parent 6931a25b45
commit 9fbf62e901
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -330,14 +330,13 @@ bool AuthGPG::storeAllKeys_locked()
gpg_error_t ERR; gpg_error_t ERR;
if (!gpgmeInit) if (!gpgmeInit)
{ {
std::cerr << "Error since GPG is not initialised" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() Error since GPG is not initialised" << std::endl;
return false; return false;
} }
#ifdef GPG_DEBUG #ifdef GPG_DEBUG
std::cerr << "AuthGPG::storeAllKeys_locked() clearing existing ones" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() clearing existing ones" << std::endl;
#endif #endif
mKeyList.clear();
/* enable SIG mode */ /* enable SIG mode */
gpgme_keylist_mode_t origmode = gpgme_get_keylist_mode(CTX); gpgme_keylist_mode_t origmode = gpgme_get_keylist_mode(CTX);
@ -351,13 +350,27 @@ bool AuthGPG::storeAllKeys_locked()
/* Initiates a key listing 0 = All Keys */ /* Initiates a key listing 0 = All Keys */
if (GPG_ERR_NO_ERROR != gpgme_op_keylist_start (CTX, "", 0)) if (GPG_ERR_NO_ERROR != gpgme_op_keylist_start (CTX, "", 0))
{ {
std::cerr << "Error iterating through KeyList" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() Error iterating through KeyList" << std::endl;
if (rsicontrol != NULL) {
rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot acess key list.");
}
gpgme_set_keylist_mode(CTX, origmode); gpgme_set_keylist_mode(CTX, origmode);
return false; return false;
} }
/* Loop until end of key */ /* Loop until end of key */
for(int i = 0;(GPG_ERR_NO_ERROR == (ERR = gpgme_op_keylist_next (CTX, &KEY))); i++) ERR = gpgme_op_keylist_next (CTX, &KEY);
if (GPG_ERR_NO_ERROR != ERR) {
std::cerr << "AuthGPG::storeAllKeys_locked() didn't find any gpg key in the keyring" << std::endl;
if (rsicontrol != NULL) {
rsicontrol->getNotify().notifyErrorMsg(0,0,"Error reading gpg keyring, cannot find any key in the list.");
}
return false;
} else {
//let's start a new list
mKeyList.clear();
}
for(int i = 0;GPG_ERR_NO_ERROR == ERR; i++)
{ {
/* store in pqiAuthDetails */ /* store in pqiAuthDetails */
gpgcert nu; gpgcert nu;
@ -368,7 +381,7 @@ bool AuthGPG::storeAllKeys_locked()
if ((!KEY->subkeys) || (!KEY->uids)) if ((!KEY->subkeys) || (!KEY->uids))
{ {
std::cerr << "Invalid Key in List... skipping" << std::endl; std::cerr << "AuthGPG::storeAllKeys_locked() Invalid Key in List... skipping" << std::endl;
continue; continue;
} }
@ -474,6 +487,8 @@ bool AuthGPG::storeAllKeys_locked()
if (nu.id == mOwnGpgId) { if (nu.id == mOwnGpgId) {
mOwnGpgCert = nu; mOwnGpgCert = nu;
} }
ERR = gpgme_op_keylist_next (CTX, &KEY);
} }
if (GPG_ERR_NO_ERROR != gpgme_op_keylist_end(CTX)) if (GPG_ERR_NO_ERROR != gpgme_op_keylist_end(CTX))