* gpgsm.c (main): New options --assume-{armor,base64,binary}.

* base64.c (base64_reader_cb): Fixed non-autodetection mode.

3 files changed, 65 insertions, 5 deletions

diff --git a/sm/ChangeLog b/sm/ChangeLog
index 171d2b04a..140fc2eba 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-12  Werner Koch  <[email protected]>
+
+	* gpgsm.c (main): New options --assume-{armor,base64,binary}. 
+	* base64.c (base64_reader_cb): Fixed non-autodetection mode.
+
 2001-12-04  Werner Koch  <[email protected]>
 
 	* call-agent.c (read_from_agent): Check for inquire responses.
diff --git a/sm/base64.c b/sm/base64.c
index dca0fd14b..7373b1c39 100644
--- a/sm/base64.c
+++ b/sm/base64.c
@@ -53,6 +53,7 @@ struct reader_cb_parm_s {
 
   int identified;
   int is_pem;
+  int is_base64;
   int stop_seen;
 
   struct {
@@ -164,14 +165,28 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
 
   if (!parm->identified)
     {
-      if (parm->line_counter == 1 && !parm->have_lf)
+      if (!parm->autodetect)
+        {
+          if (parm->assume_pem)
+            {
+              /* wait for the header line */
+              if (!parm->have_lf || strncmp (parm->line, "-----BEGIN ", 11)
+                  || strncmp (parm->line+11, "PGP ", 4))
+                goto next;
+              parm->linelen = parm->readpos = 0;
+              parm->is_pem = 1;
+            }
+          else if (parm->assume_base64)
+            parm->is_base64 = 1;
+        }
+      else if (parm->line_counter == 1 && !parm->have_lf)
         {
           /* first line too long - assume DER encoding */
           parm->is_pem = 0;
         }
       else if (parm->line_counter == 1 && parm->linelen && *parm->line == 0x30)
         {
-          /* the very first bytes does pretty much look like a SEQUENCE tag*/
+          /* the very first byte does pretty much look like a SEQUENCE tag*/
           parm->is_pem = 0;
         }
       else if ( parm->have_lf && !strncmp (parm->line, "-----BEGIN ", 11)
@@ -194,9 +209,10 @@ base64_reader_cb (void *cb_value, char *buffer, size_t count, size_t *nread)
   
 
   n = 0;
-  if (parm->is_pem)
+  if (parm->is_pem || parm->is_base64)
     {  
-      if (parm->have_lf && !strncmp (parm->line, "-----END ", 9))
+      if (parm->is_pem && parm->have_lf
+          && !strncmp (parm->line, "-----END ", 9))
         { 
           parm->identified = 0;
           parm->linelen = parm->readpos = 0;
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index fe3e664b3..5a325b8f2 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -79,6 +79,10 @@ enum cmd_and_opt_values {
   oEnableSpecialFilenames,
   oAgentProgram,
 
+  oAssumeArmor,
+  oAssumeBase64,
+  oAssumeBinary,
+
   oTextmode,
   oFingerprint,
   oWithFingerprint,
@@ -200,7 +204,17 @@ static ARGPARSE_OPTS opts[] = {
 
     { oArmor, "armor",     0, N_("create ascii armored output")},
     { oArmor, "armour",     0, "@" },
+    
+    { oAssumeArmor,  "assume-armor", 0, N_("assume input is in PEM format")},
+    { oAssumeBase64, "assume-base64", 0,
+                                      N_("assume input is in base-64 format")},
+    { oAssumeBase64, "assume-binary", 0,
+                                      N_("assume input is in binary format")},
+
+
     { oRecipient, "recipient", 2, N_("|NAME|encrypt for NAME")},
+
+#if 0
     { oRecipient, "remote-user", 2, "@"},  /* old option name */
     { oDefRecipient, "default-recipient" ,2,
 				  N_("|NAME|use NAME as default recipient")},
@@ -209,19 +223,25 @@ static ARGPARSE_OPTS opts[] = {
     { oNoDefRecipient, "no-default-recipient", 0, "@" },
     { oEncryptTo, "encrypt-to", 2, "@" },
     { oNoEncryptTo, "no-encrypt-to", 0, "@" },
+
+#endif
     { oUser, "local-user",2, N_("use this user-id to sign or decrypt")},
     { oCompress, NULL,	      1, N_("|N|set compress level N (0 disables)") },
+#if 0
     { oTextmodeShort, NULL,   0, "@"},
     { oTextmode, "textmode",  0, N_("use canonical text mode")},
+#endif
     { oOutput, "output",    2, N_("use as output file")},
     { oVerbose, "verbose",   0, N_("verbose") },
     { oQuiet,	"quiet",   0, N_("be somewhat more quiet") },
     { oNoTTY, "no-tty", 0, N_("don't use the terminal at all") },
+#if 0
     { oForceV3Sigs, "force-v3-sigs", 0, N_("force v3 signatures") },
     { oForceMDC, "force-mdc", 0, N_("always use a MDC for encryption") },
+#endif
     { oDryRun, "dry-run",   0, N_("do not make any changes") },
   /*{ oInteractive, "interactive", 0, N_("prompt before overwriting") }, */
-    { oUseAgent, "use-agent",0, N_("use the gpg-agent")},
+    /*{ oUseAgent, "use-agent",0, N_("use the gpg-agent")},*/
     { oBatch, "batch",     0, N_("batch mode: never ask")},
     { oAnswerYes, "yes",       0, N_("assume yes on most questions")},
     { oAnswerNo,  "no",        0, N_("assume no on most questions")},
@@ -664,9 +684,28 @@ main ( int argc, char **argv)
 
         case oArmor: opt.armor = 1; opt.no_armor=0; break;
         case oNoArmor: 
+          /* use of no-armor for setting the input encoding is deprecated*/
           ctrl.autodetect_encoding = 0;
           opt.no_armor=1; opt.armor=0; 
           break;
+          
+        case oAssumeArmor:
+          ctrl.autodetect_encoding = 0;
+          ctrl.is_pem = 1;
+          ctrl.is_base64 = 0;
+          break;
+        case oAssumeBase64:
+          ctrl.autodetect_encoding = 0;
+          ctrl.is_pem = 0;
+          ctrl.is_base64 = 1;
+          break;
+        case oAssumeBinary:
+          ctrl.autodetect_encoding = 0;
+          ctrl.is_pem = 0;
+          ctrl.is_base64 = 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;