Mercurial > ~mikael > mcabber > hg

comparison mcabber/src/pgp.c @ 1047:0dc104d51dce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PGP: Better error messages
author Mikael Berthe <mikael@lilotux.net>
date Sun, 26 Nov 2006 19:06:48 +0100
parents d4b97a2423eb
children ad5de4d1ee56
comparison
equal deleted inserted replaced
1046:a3748bd3d010 1047:0dc104d51dce
234 } 234 }
235 gpgme_data_release(data_sign); 235 gpgme_data_release(data_sign);
236 } 236 }
237 if (err) 237 if (err)
238 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8, 238 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
239 "GPGME error: %s", gpgme_strerror(err)); 239 "GPGME verification error: %s", gpgme_strerror(err));
240 gpgme_release(ctx); 240 gpgme_release(ctx);
241 g_free(data); 241 g_free(data);
242 return verified_key; 242 return verified_key;
243 } 243 }
244 244
299 } 299 }
300 gpgme_data_release(in); 300 gpgme_data_release(in);
301 } 301 }
302 if (err && err != GPG_ERR_CANCELED) 302 if (err && err != GPG_ERR_CANCELED)
303 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8, 303 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
304 "GPGME error: %s", gpgme_strerror(err)); 304 "GPGME signature error: %s", gpgme_strerror(err));
305 gpgme_release(ctx); 305 gpgme_release(ctx);
306 return signed_data; 306 return signed_data;
307 } 307 }
308 308
309 // gpg_decrypt(gpg_data) 309 // gpg_decrypt(gpg_data)
361 } 361 }
362 gpgme_data_release(in); 362 gpgme_data_release(in);
363 } 363 }
364 if (err && err != GPG_ERR_CANCELED) 364 if (err && err != GPG_ERR_CANCELED)
365 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8, 365 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
366 "GPGME error: %s", gpgme_strerror(err)); 366 "GPGME decryption error: %s", gpgme_strerror(err));
367 gpgme_release(ctx); 367 gpgme_release(ctx);
368 g_free(data); 368 g_free(data);
369 return decrypted_data; 369 return decrypted_data;
370 } 370 }
371 371
409 gpgme_data_release(out); 409 gpgme_data_release(out);
410 } 410 }
411 gpgme_data_release(in); 411 gpgme_data_release(in);
412 } 412 }
413 gpgme_key_release(key); 413 gpgme_key_release(key);
414 } else {
415 scr_LogPrint(LPRINT_LOGNORM, "GPGME encryption error: key not found");
416 err = 0;
414 } 417 }
415 if (err && err != GPG_ERR_CANCELED) 418 if (err && err != GPG_ERR_CANCELED)
416 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8, 419 scr_LogPrint(LPRINT_LOGNORM|LPRINT_NOTUTF8,
417 "GPGME error: %s", gpgme_strerror(err)); 420 "GPGME encryption error: %s", gpgme_strerror(err));
418 gpgme_release(ctx); 421 gpgme_release(ctx);
419 edata = strip_header_footer(encrypted_data); 422 edata = strip_header_footer(encrypted_data);
420 if (encrypted_data) 423 if (encrypted_data)
421 free(encrypted_data); 424 free(encrypted_data);
422 return edata; 425 return edata;