From 62452ed3c5b37d03dbf71cb47a18842a0cf54b0d Mon Sep 17 00:00:00 2001 From: joss17 Date: Tue, 27 Oct 2009 20:48:11 +0000 Subject: [PATCH] add gpgme error output git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1737 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/authgpg.cc | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc index 20a30345b..cbb59bc55 100644 --- a/libretroshare/src/pqi/authgpg.cc +++ b/libretroshare/src/pqi/authgpg.cc @@ -1360,14 +1360,15 @@ bool GPGAuthMgr::getPGPAllList(std::list &ids) bool GPGAuthMgr::decryptText(gpgme_data_t CIPHER, gpgme_data_t PLAIN) { RsStackMutex stack(pgpMtx); /******* LOCKED ******/ - if (GPG_ERR_NO_ERROR != gpgme_op_decrypt (CTX, CIPHER, PLAIN)) + gpg_error_t ERR; + if (GPG_ERR_NO_ERROR != (ERR = gpgme_op_decrypt (CTX, CIPHER, PLAIN))) { - std::cerr << "Error decrypting text"; + ProcessPGPmeError(ERR); + std::cerr << "GPGAuthMgr::decryptText() Error decrypting text."; std::cerr << std::endl; return false; } - return true; } @@ -1375,11 +1376,13 @@ bool GPGAuthMgr::encryptText(gpgme_data_t PLAIN, gpgme_data_t CIPHER) { RsStackMutex stack(pgpMtx); /******* LOCKED ******/ gpgme_encrypt_flags_t* flags = new gpgme_encrypt_flags_t(); - gpgme_key_t keys[2] = {mOwnGpgCert.key, NULL}; + gpgme_key_t keys[2] = {mOwnGpgCert.key, NULL}; - if (GPG_ERR_NO_ERROR != gpgme_op_encrypt(CTX, keys, *flags, PLAIN, CIPHER)) + gpg_error_t ERR; + if (GPG_ERR_NO_ERROR != (ERR = gpgme_op_encrypt(CTX, keys, *flags, PLAIN, CIPHER))) { - std::cerr << "Error encrypting text"; + ProcessPGPmeError(ERR); + std::cerr << "GPGAuthMgr::encryptText() Error encrypting text."; std::cerr << std::endl; return false; }