From 3c8bc3e68e6ba5eb55a9f4079cf790a9a88c63ff Mon Sep 17 00:00:00 2001 From: djcb Date: Wed, 18 Jul 2012 11:51:21 +0300 Subject: [PATCH] * crypto: some small updates --- TODO | 11 +++++++++-- configure.ac | 2 +- man/mu-verify.1 | 4 ++-- mu/mu-cmd.c | 3 ++- mu/tests/test-mu-cmd.c | 8 +++++--- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/TODO b/TODO index 1d2be7ae..6a217d56 100644 --- a/TODO +++ b/TODO @@ -6,7 +6,7 @@ *** mu - - handling of signed / encrypted messages + - handling of encrypted messages - maybe use gstringchunk in mu-msg-cache - put threading information in the database, and enable getting the complete threads when searching @@ -51,8 +51,10 @@ mu4e-view-message-with-msgid) - improve mouse interaction (i.e., cursor vs point) - add example 'run shellscript on message' + - hook up with 'mu verify' + - don't show GPG/PKCS7 sigs as attachments -** Done (0.9.9) +* Done (0.9.9) - make contacts in the view clickable (toggle long/short display, compose message) - opening urls is too eager (now use M-RET for opening url at point, not just @@ -68,6 +70,11 @@ certain time (mtime) - add mu:timestamp for guile (refering to the message file's mtime) - guile automated tests + - add 'mu verify' + - automated tests + - handle verbose/quiet/normal output 'mu verify' + - handle pkcs signatures + - check gmime 2.4 does not break * Done :PROPERTIES: diff --git a/configure.ac b/configure.ac index 9eeb1ba2..082c140b 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ ## along with this program; if not, write to the Free Software Foundation, ## Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -AC_INIT([mu],[0.9.9-dev1],[http://code.google.com/p/mu0/issues/list],[mu]) +AC_INIT([mu],[0.9.9-dev2],[http://code.google.com/p/mu0/issues/list],[mu]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([mu/mu.cc]) # libtoolize wants to put some stuff in here; if you have an old diff --git a/man/mu-verify.1 b/man/mu-verify.1 index c11289bf..6a617f83 100644 --- a/man/mu-verify.1 +++ b/man/mu-verify.1 @@ -6,7 +6,7 @@ mu verify\- verify message signatures and display information about them .SH SYNOPSIS -.B mu verify [options] [*] +.B mu verify [options] .SH DESCRIPTION @@ -55,7 +55,7 @@ which does not give any output. .SH RETURN VALUE \fBmu verify\fR returns 0 when all signatures could be verified to be good, -and returns some non-zero error code when this is not the case +and returns some non-zero error code when this is not the case. .nf | code | meaning | diff --git a/mu/mu-cmd.c b/mu/mu-cmd.c index 44126329..bb11c78b 100644 --- a/mu/mu-cmd.c +++ b/mu/mu-cmd.c @@ -481,7 +481,8 @@ mu_cmd_verify (MuConfig *opts, GError **err) MuError mu_cmd_verify (MuConfig *opts, GError **err) { - g_warning ("Your version of mu does not support crypto"); + g_warning ("your version of mu does not support the 'verify' command"); + return MU_ERROR_IN_PARAMETERS; } #endif /*!BUILD_CRYPTO*/ diff --git a/mu/tests/test-mu-cmd.c b/mu/tests/test-mu-cmd.c index a4071a21..ac465d73 100644 --- a/mu/tests/test-mu-cmd.c +++ b/mu/tests/test-mu-cmd.c @@ -736,7 +736,7 @@ test_mu_mkdir_01 (void) /* we can only test 'verify' if gpg is installed, and has * djcb@djcbsoftware's key in the keyring */ -static gboolean +G_GNUC_UNUSED static gboolean verify_is_testable (void) { gchar *gpg, *cmdline; @@ -767,7 +767,7 @@ verify_is_testable (void) return (rv && retval == 0) ? TRUE:FALSE; } -static void +G_GNUC_UNUSED static void test_mu_verify_good (void) { gchar *cmdline; @@ -788,7 +788,7 @@ test_mu_verify_good (void) } -static void +G_GNUC_UNUSED static void test_mu_verify_bad (void) { gchar *cmdline; @@ -854,8 +854,10 @@ main (int argc, char *argv[]) g_test_add_func ("/mu-cmd/test-mu-view-attach", test_mu_view_attach); g_test_add_func ("/mu-cmd/test-mu-mkdir-01", test_mu_mkdir_01); +#ifdef BUILD_CRYPTO g_test_add_func ("/mu-cmd/test-mu-verify-good", test_mu_verify_good); g_test_add_func ("/mu-cmd/test-mu-verify-bad", test_mu_verify_bad); +#endif /*BUILD_CRYPTO*/ g_log_set_handler (NULL, G_LOG_LEVEL_MASK | G_LOG_LEVEL_WARNING|