* src/plugins/pgpcore/sgpgme.c
Report error when there's one, instead of
"Signature unchecked"
+2005-09-27 [colin] 1.9.14cvs58
+
+ * src/plugins/pgpcore/sgpgme.c
+ Report error when there's one, instead of
+ "Signature unchecked"
+
2005-09-27 [colin] 1.9.14cvs57
* src/prefs_quote.c
2005-09-27 [colin] 1.9.14cvs57
* src/prefs_quote.c
( cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/gtk/gtkaspell.c; ) > 1.9.14cvs55.patchset
( cvs diff -u -r 1.65.2.39 -r 1.65.2.40 src/codeconv.c; cvs diff -u -r 1.382.2.176 -r 1.382.2.177 src/compose.c; cvs diff -u -r 1.50.2.13 -r 1.50.2.14 src/compose.h; ) > 1.9.14cvs56.patchset
( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_quote.c; ) > 1.9.14cvs57.patchset
( cvs diff -u -r 1.9.2.28 -r 1.9.2.29 src/gtk/gtkaspell.c; ) > 1.9.14cvs55.patchset
( cvs diff -u -r 1.65.2.39 -r 1.65.2.40 src/codeconv.c; cvs diff -u -r 1.382.2.176 -r 1.382.2.177 src/compose.c; cvs diff -u -r 1.50.2.13 -r 1.50.2.14 src/compose.h; ) > 1.9.14cvs56.patchset
( cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/prefs_quote.c; ) > 1.9.14cvs57.patchset
+( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/plugins/pgpcore/sgpgme.c; ) > 1.9.14cvs58.patchset
MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=14
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
if ((err = gpgme_op_verify(ctx, sig, plain, dummy)) != GPG_ERR_NO_ERROR) {
debug_print("op_verify err %s\n", gpgme_strerror(err));
if ((err = gpgme_op_verify(ctx, sig, plain, dummy)) != GPG_ERR_NO_ERROR) {
debug_print("op_verify err %s\n", gpgme_strerror(err));
+ return GINT_TO_POINTER(-GPG_ERR_SYSTEM_ERROR);
+
}
status = gpgme_op_verify_result(ctx);
}
status = gpgme_op_verify_result(ctx);
unsigned long validity = 0;
gpgme_signature_t sig = NULL;
unsigned long validity = 0;
gpgme_signature_t sig = NULL;
- if (status == NULL)
- return SIGNATURE_UNCHECKED;
+ if (GPOINTER_TO_INT(status) == -GPG_ERR_SYSTEM_ERROR) {
+ debug_print("system error\n");
+ return SIGNATURE_CHECK_FAILED;
+ }
+ if (status == NULL) {
+ debug_print("status == NULL\n");
+ return SIGNATURE_UNCHECKED;
+ }
sig = status->signatures;
sig = status->signatures;
+ if (sig == NULL) {
+ debug_print("sig == NULL\n");
return SIGNATURE_UNCHECKED;
return SIGNATURE_UNCHECKED;
validity = sig->validity;
validity = sig->validity;
+ debug_print("err code %d\n", gpg_err_code(sig->status));
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
if ((validity != GPGME_VALIDITY_MARGINAL) &&
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
if ((validity != GPGME_VALIDITY_MARGINAL) &&
gchar *uname = NULL;
gpgme_key_t key;
gchar *uname = NULL;
gpgme_key_t key;
+ if (GPOINTER_TO_INT(status) == -GPG_ERR_SYSTEM_ERROR) {
+ return g_strdup(_("The signature can't be checked - GPG error."));
+ }
+
if (status == NULL) {
return g_strdup(_("The signature has not been checked."));
}
if (status == NULL) {
return g_strdup(_("The signature has not been checked."));
}