* g10.c (main): Disable --textmode when encrypting (symmetric or pk) in
authorDavid Shaw <dshaw@jabberwocky.com>
Tue, 15 Oct 2002 17:01:04 +0000 (17:01 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Tue, 15 Oct 2002 17:01:04 +0000 (17:01 +0000)
--pgp2 mode as PGP 2 can't handle the unknown length literal packet.
Reported by Michael Richardson.

g10/ChangeLog
g10/g10.c

index c832f1c..42d3c9e 100644 (file)
@@ -1,3 +1,9 @@
+2002-10-15  David Shaw  <dshaw@jabberwocky.com>
+
+       * g10.c (main): Disable --textmode when encrypting (symmetric or
+       pk) in --pgp2 mode as PGP 2 can't handle the unknown length
+       literal packet.  Reported by Michael Richardson.
+
 2002-10-14  David Shaw  <dshaw@jabberwocky.com>
 
        * keyserver-internal.h, keyserver.c (print_keyrec, parse_keyrec,
index 3cc6b54..e7121b7 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1806,9 +1806,20 @@ main( int argc, char **argv )
                  }
                else if(cmd==aSym)
                  {
+                   /* This only sets IDEA for symmetric encryption
+                      since it is set via select_algo_from_prefs for
+                      pk encryption. */
                    m_free(def_cipher_string);
                    def_cipher_string = m_strdup("idea");
                  }
+
+               /* PGP2 can't handle the output from the textmode
+                  filter, so we disable it for anything that could
+                  create a literal packet (only encryption and
+                  symmetric encryption, since we disable signing
+                  above). */
+               if(!unusable)
+                 opt.textmode=0;
              }
 
            if(unusable)