Attachment #544050 for bug #664070

Lines 137-143 Link Here

(-)sylpheed-3.7.0.orig/INSTALL (-1 / +1 lines)
137		137
138	http://freshmeat.net/projects/compface/	138	http://freshmeat.net/projects/compface/
139		139
140	GnuPG (>= 1.2.0) and GPGME (>= 1.0.0) are required for GnuPG (PGP) support.	140	GnuPG (>= 1.2.0) and GPGME (>= 1.7.0) are required for GnuPG (PGP) support.
141	You can get GnuPG and GPGME from the following location:	141	You can get GnuPG and GPGME from the following location:
142		142
143	ftp://ftp.gnupg.org/gcrypt/gpgme/	143	ftp://ftp.gnupg.org/gcrypt/gpgme/

Lines 137-143 Link Here

(-)sylpheed-3.7.0.orig/INSTALL.ja (-1 / +1 lines)
137		137
138	http://freshmeat.net/projects/compface/	138	http://freshmeat.net/projects/compface/
139		139
140	GnuPG (PGP)ÂÐ±þ¤òÍ¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 1.0.0 °Ê¹ß¤È GnuPG 1.2.0 °Ê¹ß¤¬	140	GnuPG (PGP)ÂÐ±þ¤òÍ¸ú¤Ë¤·¤¿¤¤¾ì¹ç¤Ï¡¢ GPGME 1.7.0 °Ê¹ß¤È GnuPG 1.2.0 °Ê¹ß¤¬
141	É¬Í×¤Ç¤¹¡£ GnuPG ¤È GPGME ¤Ï°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤¤Þ¤¹:	141	É¬Í×¤Ç¤¹¡£ GnuPG ¤È GPGME ¤Ï°Ê²¼¤Î¾ì½ê¤«¤é¼èÆÀ¤Ç¤¤Þ¤¹:
142		142
143	ftp://ftp.gnupg.org/gcrypt/gpgme/	143	ftp://ftp.gnupg.org/gcrypt/gpgme/

Lines 179-185 Link Here

(-)sylpheed-3.7.0.orig/configure.ac (-1 / +1 lines)
179	AC_MSG_CHECKING([whether to use GPGME])	179	AC_MSG_CHECKING([whether to use GPGME])
180	if test $ac_cv_enable_gpgme = yes; then	180	if test $ac_cv_enable_gpgme = yes; then
181	AC_MSG_RESULT(yes)	181	AC_MSG_RESULT(yes)
182	AM_PATH_GPGME(1.0.0, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),	182	AM_PATH_GPGME(1.7.0, AC_DEFINE(USE_GPGME, 1, Define if you use GPGME to support OpenPGP.),
183	[use_gpgme=no	183	[use_gpgme=no
184	ac_cv_enable_gpgme=no])	184	ac_cv_enable_gpgme=no])
185	if test $ac_cv_enable_gpgme = yes; then	185	if test $ac_cv_enable_gpgme = yes; then

Lines 157-162 Link Here

(-)sylpheed-3.7.0.orig/src/rfc2015.c (+6 lines)
157	(str, _(" aka \"%s\"\n"), user->uid);	157	(str, _(" aka \"%s\"\n"), user->uid);
158	user = user->next;	158	user = user->next;
159	}	159	}
		160
		161	/* gpgme_get_key doesn't set tofu description field even with
		162	* GPGME_KEYLIST_MODE_WITH_TOFU flag set, so it should be
		163	* extracted from sig->key directly */
		164	if (sig->key && sig->key->uids && sig->key->uids->tofu)
		165	gpgmegtk_tofu_status_to_string (str, sig->key->uids);
160	}	166	}
161		167
162	static gchar *sig_status_full(gpgme_ctx_t ctx, gpgme_verify_result_t result)	168	static gchar *sig_status_full(gpgme_ctx_t ctx, gpgme_verify_result_t result)

Lines 238-246 Link Here

(-)sylpheed-3.7.0.orig/src/sigstatus.c (-2 / +97 lines)
238	case GPG_ERR_NO_ERROR:	238	case GPG_ERR_NO_ERROR:
239	switch (signature->validity) {	239	switch (signature->validity) {
240	case GPGME_VALIDITY_ULTIMATE:	240	case GPGME_VALIDITY_ULTIMATE:
		241	result = use_name ? _("Good signature (ultimate trust) from \"%s\"") :
		242	_("Good signature");
		243	break;
241	case GPGME_VALIDITY_FULL:	244	case GPGME_VALIDITY_FULL:
		245	result = use_name ? _("Good signature (full trust) from \"%s\"") :
		246	_("Good signature");
		247	break;
242	case GPGME_VALIDITY_MARGINAL:	248	case GPGME_VALIDITY_MARGINAL:
243	result = use_name ? _("Good signature from \"%s\"") :	249	result = use_name ? _("Good signature (marginal trust) from \"%s\"") :
244	_("Good signature");	250	_("Good signature");
245	break;	251	break;
246	default:	252	default:
Lines 270-280 Link Here
270	result = _("No public key to verify the signature");	276	result = _("No public key to verify the signature");
271	break;	277	break;
272	default:	278	default:
273	result = _("Error verifying the signature");	279	switch (signature->summary) {
		280	case GPGME_SIGSUM_KEY_REVOKED:
		281	result = _("The key or at least one certificate has been revoked");
		282	break;
		283	case GPGME_SIGSUM_KEY_MISSING:
		284	result = _("Can't verify due to a missing key or certificate");
		285	break;
		286	case GPGME_SIGSUM_CRL_MISSING:
		287	result = _("The CRL (or an equivalent mechanism) is not available");
		288	break;
		289	case GPGME_SIGSUM_CRL_TOO_OLD:
		290	result = _("Available CRL is too old");
		291	break;
		292	case GPGME_SIGSUM_BAD_POLICY:
		293	result = _("A policy requirement was not met");
		294	break;
		295	case GPGME_SIGSUM_SYS_ERROR:
		296	result = _("A system error occured");
		297	break;
		298	case GPGME_SIGSUM_TOFU_CONFLICT:
		299	result = _("A TOFU conflict was detected");
		300	break;
		301	default:
		302	result = _("Error verifying the signature");
		303	}
274	break;	304	break;
275	}	305	}
276		306
277	return result;	307	return result;
278	}	308	}
279		309
		310	void tofu_to_string(GString str, gpgme_tofu_info_t tofu, char uid)
		311	{
		312	if (tofu->description)
		313	g_string_sprintfa(str, _("%s\n"), tofu->description);
		314	else
		315	g_string_sprintfa(str, _("%s:\n"), uid);
		316
		317	switch (tofu->validity) {
		318	case 0:
		319	g_string_append(str, _(" Validity [0]: CONFLICT. "));
		320	break;
		321	case 1:
		322	g_string_append(str, _(" Validity [1]: no prior history. "));
		323	break;
		324	case 2:
		325	g_string_append(str, _(" Validity [2]: too little history. "));
		326	break;
		327	case 3:
		328	g_string_append(str, _(" Validity [3]: enough history for basic trust. "));
		329	break;
		330	case 4:
		331	g_string_append(str, _(" Validity [4]: long established history. "));
		332	break;
		333	default:
		334	g_string_append(str, _(" Validity: unknown. "));
		335	break;
		336	}
		337
		338	switch (tofu->policy) {
		339	case GPGME_TOFU_POLICY_AUTO:
		340	g_string_append(str, _("Policy: auto.\n"));
		341	break;
		342	case GPGME_TOFU_POLICY_GOOD:
		343	g_string_append(str, _("Policy: good.\n"));
		344	break;
		345	case GPGME_TOFU_POLICY_BAD:
		346	g_string_append(str, _("Policy: bad.\n"));
		347	break;
		348	case GPGME_TOFU_POLICY_ASK:
		349	g_string_append(str, _("Policy: ask.\n"));
		350	break;
		351	default:
		352	g_string_append(str, _("Policy: unknown.\n"));
		353	break;
		354	}
		355	}
		356
		357	void gpgmegtk_tofu_status_to_string(GString *str, gpgme_user_id_t user)
		358	{
		359	gpgme_tofu_info_t tofu;
		360	g_string_append(str, _("TOFU status:\n"));
		361
		362	do {
		363	if (!(tofu = user->tofu))
		364	continue;
		365	tofu_to_string (str, tofu, user->uid);
		366
		367	while ((tofu = tofu->next)) {
		368	g_string_append(str, _("and:\n"));
		369	tofu_to_string (str, tofu, user->uid);
		370	}
		371	}
		372	while ((user = user->next));
		373	}
374
280	#endif /* USE_GPGME */	375	#endif /* USE_GPGME */

Lines 30-34 Link Here

(-)sylpheed-3.7.0.orig/src/sigstatus.h (+1 lines)
30		30
31	const gchar *gpgmegtk_sig_status_to_string(gpgme_signature_t signature,	31	const gchar *gpgmegtk_sig_status_to_string(gpgme_signature_t signature,
32	gboolean use_name);	32	gboolean use_name);
		33	void gpgmegtk_tofu_status_to_string(GString *str, gpgme_user_id_t user);
33		34
34	#endif /* GPGMEGTK_SIGSTATUS_H */	35	#endif /* GPGMEGTK_SIGSTATUS_H */

Return to bug 664070