2012-07-08 [ticho] 3.8.1cvs11

	* src/plugins/pgpcore/sgpgme.c
		Consider marginal signature validity as untrusted. Suggested by
		Jean-Benoist Leger (leger at crans.org).

diff --git a/ChangeLog b/ChangeLog
index eccfbd867d1ee7350ed0750b930022fc4236c044..9e1849686560632b36f04da08887a6392d11233a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-08 [ticho]     3.8.1cvs11
+
+       * src/plugins/pgpcore/sgpgme.c
+               Consider marginal signature validity as untrusted. Suggested by
+               Jean-Benoist Leger (leger at crans.org).
+

 2012-07-08 [paul]      3.8.1cvs10
 
        * src/gtk/icon_legend.c
 2012-07-08 [paul]      3.8.1cvs10
 
        * src/gtk/icon_legend.c

diff --git a/PATCHSETS b/PATCHSETS
index d948eacab54c021f2114db96b507f95640caaa61..b08c1107d642b133bb7940612210f928f845ebda 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -4385,3 +4385,4 @@
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-features.h.in;  cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/codeconv.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/imap_gtk.h;  cvs diff -u -r 1.29.2.18 -r 1.29.2.19 src/inc.h;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/jpilot.h;  cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/messageview.h;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/msgcache.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/news_gtk.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.h;  cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/pop.h;  cvs diff -u -r 1.49.2.48 -r 1.49.2.49 src/prefs_account.h;  cvs diff -u -r 1.103.2.140 -r 1.103.2.141 src/prefs_common.h;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/printing.h;  cvs diff -u -r 1.17.2.28 -r 1.17.2.29 src/procmime.h;  cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/procmsg.h;  cvs diff -u -r 1.25.2.74 -r 1.25.2.75 src/stock_pixmap.c;  cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/textview.h;  cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/defs.h;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/log.h;  cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/common/session.h;  cvs diff -u -r 1.6.2.20 -r 1.6.2.21 src/common/smtp.h;  cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.h;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/common/ssl.h;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/timing.h;  cvs diff -u -r 1.20.2.79 -r 1.20.2.80 src/common/utils.h;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkaspell.h;  cvs diff -u -r 1.4.2.66 -r 1.4.2.67 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/pluginwindow.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.h;  cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/gtk/sslcertwindow.h;  ) > 3.8.1cvs8.patchset
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/prefs_gpg.c;  ) > 3.8.1cvs9.patchset
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/icon_legend.c;  ) > 3.8.1cvs10.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 claws-features.h.in;  cvs diff -u -r 1.15.2.28 -r 1.15.2.29 src/codeconv.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/imap_gtk.h;  cvs diff -u -r 1.29.2.18 -r 1.29.2.19 src/inc.h;  cvs diff -u -r 1.10.2.10 -r 1.10.2.11 src/jpilot.h;  cvs diff -u -r 1.19.2.31 -r 1.19.2.32 src/messageview.h;  cvs diff -u -r 1.5.2.11 -r 1.5.2.12 src/msgcache.h;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/news_gtk.h;  cvs diff -u -r 1.1.2.12 -r 1.1.2.13 src/partial_download.h;  cvs diff -u -r 1.17.2.26 -r 1.17.2.27 src/pop.h;  cvs diff -u -r 1.49.2.48 -r 1.49.2.49 src/prefs_account.h;  cvs diff -u -r 1.103.2.140 -r 1.103.2.141 src/prefs_common.h;  cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/printing.h;  cvs diff -u -r 1.17.2.28 -r 1.17.2.29 src/procmime.h;  cvs diff -u -r 1.60.2.62 -r 1.60.2.63 src/procmsg.h;  cvs diff -u -r 1.25.2.74 -r 1.25.2.75 src/stock_pixmap.c;  cvs diff -u -r 1.12.2.33 -r 1.12.2.34 src/textview.h;  cvs diff -u -r 1.9.2.56 -r 1.9.2.57 src/common/defs.h;  cvs diff -u -r 1.4.2.11 -r 1.4.2.12 src/common/log.h;  cvs diff -u -r 1.8.2.20 -r 1.8.2.21 src/common/session.h;  cvs diff -u -r 1.6.2.20 -r 1.6.2.21 src/common/smtp.h;  cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.h;  cvs diff -u -r 1.2.2.16 -r 1.2.2.17 src/common/ssl.h;  cvs diff -u -r 1.1.4.18 -r 1.1.4.19 src/common/ssl_certificate.h;  cvs diff -u -r 1.1.2.13 -r 1.1.2.14 src/common/timing.h;  cvs diff -u -r 1.20.2.79 -r 1.20.2.80 src/common/utils.h;  cvs diff -u -r 1.5.2.20 -r 1.5.2.21 src/gtk/gtkaspell.h;  cvs diff -u -r 1.4.2.66 -r 1.4.2.67 src/gtk/gtkutils.h;  cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/gtk/pluginwindow.h;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/spell_entry.h;  cvs diff -u -r 1.6.2.14 -r 1.6.2.15 src/gtk/sslcertwindow.h;  ) > 3.8.1cvs8.patchset
 ( cvs diff -u -r 1.1.2.37 -r 1.1.2.38 src/plugins/pgpcore/prefs_gpg.c;  ) > 3.8.1cvs9.patchset
 ( cvs diff -u -r 1.1.2.23 -r 1.1.2.24 src/gtk/icon_legend.c;  ) > 3.8.1cvs10.patchset

+( cvs diff -u -r 1.1.2.70 -r 1.1.2.71 src/plugins/pgpcore/sgpgme.c;  ) > 3.8.1cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 06d0a4f4f98edb2b38b0170e06c0aa729f6478d6..4c39ce2202e4728b6616816e2b539b49a9e880bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/plugins/pgpcore/sgpgme.c b/src/plugins/pgpcore/sgpgme.c
index 52c0326dd638b1e58b5afd5aac87e29a43590355..a04f5a8f5bb9dc7981016d7cbde7d6b43f8c96d7 100644 (file)
--- a/src/plugins/pgpcore/sgpgme.c
+++ b/src/plugins/pgpcore/sgpgme.c
@@ -212,11 +212,11 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
        switch (gpg_err_code(sig->status)) {
        case GPG_ERR_NO_ERROR:
                switch (gpg_err_code(sig->validity)) {
        switch (gpg_err_code(sig->status)) {
        case GPG_ERR_NO_ERROR:
                switch (gpg_err_code(sig->validity)) {

-               case GPGME_VALIDITY_MARGINAL:

                case GPGME_VALIDITY_FULL:
                case GPGME_VALIDITY_ULTIMATE:
                        result = g_strdup_printf(_("Good signature from %s."), uname);
                        break;
                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:
                case GPGME_VALIDITY_UNKNOWN:
                case GPGME_VALIDITY_UNDEFINED:
                case GPGME_VALIDITY_NEVER: