* 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.

2 files changed, 17 insertions, 0 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index c832f1c83..42d3c9e36 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -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,
diff --git a/g10/g10.c b/g10/g10.c
index 3cc6b54aa..e7121b701 100644
--- 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)