Made decryption work in --server mode, allow output of plain base64,

allow --armor and --base64 arguments for INPUT and OUTPUT, new global
option --base64, cleaned up the help page.

1 files changed, 9 insertions, 1 deletions

diff --git a/sm/decrypt.c b/sm/decrypt.c
index 2d79b7f5d..6e88565b4 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -279,7 +279,7 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp)
       goto leave;
     }
 
-  rc = gpgsm_create_writer (&b64reader, ctrl, out_fp, &writer);
+  rc = gpgsm_create_writer (&b64writer, ctrl, out_fp, &writer);
   if (rc)
     {
       log_error ("can't create writer: %s\n", gnupg_strerror (rc));
@@ -447,6 +447,14 @@ gpgsm_decrypt (CTRL ctrl, int in_fd, FILE *out_fp)
     }
   while (stopreason != KSBA_SR_READY);   
 
+  rc = gpgsm_finish_writer (b64writer);
+  if (rc) 
+    {
+      log_error ("write failed: %s\n", gnupg_strerror (rc));
+      goto leave;
+    }
+
+
  leave:
   ksba_cms_release (cms);
   gpgsm_destroy_reader (b64reader);