Merge branch 'master' into javascript-binding

1 files changed, 31 insertions, 11 deletions

diff --git a/tests/run-decrypt.c b/tests/run-decrypt.c
index f4c47544..69de139c 100644
--- a/tests/run-decrypt.c
+++ b/tests/run-decrypt.c
@@ -53,19 +53,21 @@ print_result (gpgme_decrypt_result_t result)
   gpgme_recipient_t recp;
   int count = 0;
 
-  printf ("Original file name: %s\n", nonnull(result->file_name));
-  printf ("Wrong key usage: %i\n", result->wrong_key_usage);
-  printf ("Unsupported algorithm: %s\n",
-          nonnull(result->unsupported_algorithm));
-  if (result->session_key)
-    printf ("Session key: %s\n", result->session_key);
-
-  for (recp = result->recipients; recp->next; recp = recp->next)
+  printf ("Original file name .: %s\n", nonnull(result->file_name));
+  printf ("Wrong key usage ....: %s\n", result->wrong_key_usage? "yes":"no");
+  printf ("Compliance de-vs ...: %s\n", result->is_de_vs? "yes":"no");
+  printf ("MIME flag ..........: %s\n", result->is_mime? "yes":"no");
+  printf ("Unsupported algo ...: %s\n", nonnull(result->unsupported_algorithm));
+  printf ("Session key ........: %s\n", nonnull (result->session_key));
+  printf ("Symmetric algorithm : %s\n", result->symkey_algo);
+
+  for (recp = result->recipients; recp && recp->next; recp = recp->next)
     {
-      printf ("recipient %d\n", count++);
+      printf ("Recipient ...: %d\n", count++);
       printf ("  status ....: %s\n", gpgme_strerror (recp->status));
-      printf ("  keyid: %s\n", nonnull (recp->keyid));
-      printf ("  algo ...: %s\n", gpgme_pubkey_algo_name (recp->pubkey_algo));
+      printf ("  keyid .....: %s\n", nonnull (recp->keyid));
+      printf ("  algo ......: %s\n",
+              gpgme_pubkey_algo_name (recp->pubkey_algo));
     }
 }
 
@@ -82,6 +84,7 @@ show_usage (int ex)
          "  --export-session-key            show the session key\n"
          "  --override-session-key STRING   use STRING as session key\n"
          "  --request-origin STRING         use STRING as request origin\n"
+         "  --no-symkey-cache               disable the use of that cache\n"
          "  --unwrap         remove only the encryption layer\n"
          , stderr);
   exit (ex);
@@ -104,6 +107,7 @@ main (int argc, char **argv)
   int export_session_key = 0;
   const char *override_session_key = NULL;
   const char *request_origin = NULL;
+  int no_symkey_cache = 0;
   int raw_output = 0;
 
   if (argc)
@@ -160,6 +164,11 @@ main (int argc, char **argv)
           request_origin = *argv;
           argc--; argv++;
         }
+      else if (!strcmp (*argv, "--no-symkey-cache"))
+        {
+          no_symkey_cache = 1;
+          argc--; argv++;
+        }
       else if (!strcmp (*argv, "--unwrap"))
         {
           flags |= GPGME_DECRYPT_UNWRAP;
@@ -226,6 +235,17 @@ main (int argc, char **argv)
         }
     }
 
+  if (no_symkey_cache)
+    {
+      err = gpgme_set_ctx_flag (ctx, "no-symkey-cache", "1");
+      if (err)
+        {
+          fprintf (stderr, PGM ": error setting no-symkey-cache:  %s\n",
+                   gpgme_strerror (err));
+          exit (1);
+        }
+    }
+
   err = gpgme_data_new_from_stream (&in, fp_in);
   if (err)
     {