diff options
| author | Werner Koch <[email protected]> | 2001-11-27 17:40:09 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2001-11-27 17:40:09 +0000 |
| commit | 944fee70bc3461d80dfe73873f3d66ab0e425e4c (patch) | |
| tree | 9d80b776360c32ce54f0326e76141a102f5b4766 /sm/gpgsm.c | |
| parent | * assuan-handler.c (assuan_register_input_notify): New. (diff) | |
| download | gnupg-944fee70bc3461d80dfe73873f3d66ab0e425e4c.tar.gz gnupg-944fee70bc3461d80dfe73873f3d66ab0e425e4c.zip | |
* base64.c: New. Changed all other functions to use this instead
of direct creation of ksba_reader/writer.
* gpgsm.c (main): Set ctrl.auto_encoding unless --no-armor is used.
This way we can feed PEM encoded stuff to --verify.
Diffstat (limited to '')
| -rw-r--r-- | sm/gpgsm.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 0b6b7c237..f6cf4aeef 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -591,6 +591,7 @@ main ( int argc, char **argv) memset (&ctrl, 0, sizeof ctrl); ctrl.no_server = 1; ctrl.status_fd = -1; /* not status output */ + ctrl.autodetect_encoding = 1; /* set the default option file */ if (default_config ) @@ -661,7 +662,10 @@ main ( int argc, char **argv) case aVerify: set_cmd (&cmd, aVerify); break; case oArmor: opt.armor = 1; opt.no_armor=0; break; - case oNoArmor: opt.no_armor=1; opt.armor=0; break; + case oNoArmor: + ctrl.autodetect_encoding = 0; + opt.no_armor=1; opt.armor=0; + break; case oOutput: opt.outfile = pargs.r.ret_str; break; case oQuiet: opt.quiet = 1; break; case oNoTTY: /* fixme:tty_no_terminal(1);*/ break; |