}
}
+static const gchar *get_owner_trust_str(unsigned long owner_trust)
+{
+ switch (gpgme_err_code(owner_trust)) {
+ case GPGME_VALIDITY_NEVER:
+ return _("Untrusted");
+ case GPGME_VALIDITY_MARGINAL:
+ return _("Marginal");
+ case GPGME_VALIDITY_FULL:
+ return _("Full");
+ case GPGME_VALIDITY_ULTIMATE:
+ return _("Ultimate");
+ default:
+ return _("Unknown");
+ }
+}
+
static gchar *extract_name(const char *uid)
{
if (uid == NULL)
uname = g_strdup("<?>");
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- switch (gpg_err_code(sig->validity)) {
- case GPGME_VALIDITY_FULL:
- case GPGME_VALIDITY_ULTIMATE:
- result = g_strdup_printf(_("Good signature from %s."), uname);
- break;
- case GPGME_VALIDITY_MARGINAL:
- case GPGME_VALIDITY_UNKNOWN:
- case GPGME_VALIDITY_UNDEFINED:
- case GPGME_VALIDITY_NEVER:
- default:
- result = g_strdup_printf(_("Good signature (untrusted) from %s."), uname);
- break;
- }
+ result = g_strdup_printf(_("Good signature from %s."), uname);
break;
case GPG_ERR_SIG_EXPIRED:
result = g_strdup_printf(_("Expired signature from %s."), uname);
break;
case GPG_ERR_KEY_EXPIRED:
- result = g_strdup_printf(_("Expired key from %s."), uname);
+ result = g_strdup_printf(_("Good signature from %s, but the key has expired."), uname);
+ break;
+ case GPG_ERR_CERT_REVOKED:
+ result = g_strdup_printf(_("Good signature from %s, but the key has been revoked."), uname);
break;
case GPG_ERR_BAD_SIGNATURE:
result = g_strdup_printf(_("Bad signature from %s."), uname);
switch (gpg_err_code(sig->status)) {
case GPG_ERR_NO_ERROR:
- case GPG_ERR_KEY_EXPIRED:
g_string_append_printf(siginfo,
_("Good signature from uid \"%s\" (Validity: %s)\n"),
uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
break;
+ case GPG_ERR_KEY_EXPIRED:
+ g_string_append_printf(siginfo,
+ _("Expired key uid \"%s\"\n"),
+ uid);
+ break;
case GPG_ERR_SIG_EXPIRED:
g_string_append_printf(siginfo,
_("Expired signature from uid \"%s\" (Validity: %s)\n"),
uid, get_validity_str(user?user->validity:GPGME_VALIDITY_UNKNOWN));
break;
+ case GPG_ERR_CERT_REVOKED:
+ g_string_append_printf(siginfo,
+ _("Revoked key uid \"%s\"\n"),
+ uid);
+ break;
case GPG_ERR_BAD_SIGNATURE:
g_string_append_printf(siginfo,
_("BAD signature from \"%s\"\n"),
j++;
user = user->next;
}
+ g_string_append_printf(siginfo,_("Owner Trust: %s\n"),
+ get_owner_trust_str(key->owner_trust));
g_string_append(siginfo,
_("Primary key fingerprint:"));
const char* primary_fpr = NULL;
#else
ctype_locale = g_strdup(setlocale(LC_CTYPE, NULL));
#endif
- debug_print("setting gpgme locale to: %s\n", ctype_locale ? ctype_locale : "NULL");
- if (strchr(ctype_locale, '.'))
- *(strchr(ctype_locale, '.')) = '\0';
- else if (strchr(ctype_locale, '@'))
- *(strchr(ctype_locale, '@')) = '\0';
- ctype_utf8_locale = g_strconcat(ctype_locale, ".UTF-8", NULL);
-
- debug_print("setting gpgme locale to UTF8: %s\n", ctype_utf8_locale ? ctype_utf8_locale : "NULL");
- gpgme_set_locale(NULL, LC_CTYPE, ctype_utf8_locale);
-
- debug_print("done\n");
- g_free(ctype_utf8_locale);
- g_free(ctype_locale);
+ if (ctype_locale) {
+ debug_print("setting gpgme CTYPE locale to: %s\n", ctype_locale);
+ if (strchr(ctype_locale, '.'))
+ *(strchr(ctype_locale, '.')) = '\0';
+ else if (strchr(ctype_locale, '@'))
+ *(strchr(ctype_locale, '@')) = '\0';
+ ctype_utf8_locale = g_strconcat(ctype_locale, ".UTF-8", NULL);
+
+ debug_print("setting gpgme locale to UTF8: %s\n", ctype_utf8_locale ? ctype_utf8_locale : "NULL");
+ gpgme_set_locale(NULL, LC_CTYPE, ctype_utf8_locale);
+
+ debug_print("done\n");
+ g_free(ctype_utf8_locale);
+ g_free(ctype_locale);
+ } else {
+ debug_print("couldn't set gpgme CTYPE locale\n");
+ }
#endif
#ifdef LC_MESSAGES
debug_print("setting gpgme MESSAGES locale\n");
#else
messages_locale = g_strdup(setlocale(LC_MESSAGES, NULL));
#endif
- debug_print("setting gpgme locale to: %s\n", messages_locale ? messages_locale : "NULL");
- if (strchr(messages_locale, '.'))
- *(strchr(messages_locale, '.')) = '\0';
- else if (strchr(messages_locale, '@'))
- *(strchr(messages_locale, '@')) = '\0';
- messages_utf8_locale = g_strconcat(messages_locale, ".UTF-8", NULL);
- debug_print("setting gpgme locale to UTF8: %s\n", messages_utf8_locale ? messages_utf8_locale : "NULL");
-
- gpgme_set_locale(NULL, LC_MESSAGES, messages_utf8_locale);
-
- debug_print("done\n");
- g_free(messages_utf8_locale);
- g_free(messages_locale);
+ if (messages_locale) {
+ debug_print("setting gpgme MESSAGES locale to: %s\n", messages_locale);
+ if (strchr(messages_locale, '.'))
+ *(strchr(messages_locale, '.')) = '\0';
+ else if (strchr(messages_locale, '@'))
+ *(strchr(messages_locale, '@')) = '\0';
+ messages_utf8_locale = g_strconcat(messages_locale, ".UTF-8", NULL);
+ debug_print("setting gpgme locale to UTF8: %s\n", messages_utf8_locale ? messages_utf8_locale : "NULL");
+
+ gpgme_set_locale(NULL, LC_MESSAGES, messages_utf8_locale);
+
+ debug_print("done\n");
+ g_free(messages_utf8_locale);
+ g_free(messages_locale);
+ } else {
+ debug_print("couldn't set gpgme MESSAGES locale\n");
+ }
#endif
if (!gpgme_get_engine_info(&engineInfo)) {
while (engineInfo) {
}
key_parms = g_strdup_printf("<GnupgKeyParms format=\"internal\">\n"
- "Key-Type: DSA\n"
- "Key-Length: 1024\n"
- "Subkey-Type: ELG-E\n"
+ "Key-Type: RSA\n"
+ "Key-Length: 2048\n"
+ "Subkey-Type: RSA\n"
"Subkey-Length: 2048\n"
"Name-Real: %s\n"
"Name-Email: %s\n"
cm_gpgme_data_rewind(data);
while ((r = gpgme_data_read(data, buf, BUFSIZ)) > 0) {
result = realloc(result, r + w);
+ if (result == NULL) {
+ g_warning("can't allocate memory\n");
+ return NULL;
+ }
memcpy(result+w, buf, r);
w += r;
}