From d49a7e1a7ab91e4b741076c8c9d8436c9df574ed Mon Sep 17 00:00:00 2001 From: David Shaw Date: Fri, 16 Apr 2004 16:31:19 +0000 Subject: * plaintext.c (handle_plaintext): Accept 'u' as a plaintext mode that requires end of line conversion. This is being considered for a UTF8 text packet. If this doesn't take place, no major harm done. If it does take place, we'll get a jump on starting the changeover. * g10.c (main): --no-use-embedded-filename. * build-packet.c (calc_plaintext, do_plaintext): Do not create illegal (packet header indicates a size larger than the actual packet) encrypted data packets when not compressing and using a filename longer than 255 characters. * keyedit.c (no_primary_warning): Cleanup. (menu_expire): Don't give primary warning for subkey expiration changes. These cannot reorder primaries. --- g10/g10.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'g10/g10.c') diff --git a/g10/g10.c b/g10/g10.c index 0db3a02e6..a50251a3b 100644 --- a/g10/g10.c +++ b/g10/g10.c @@ -237,6 +237,7 @@ enum cmd_and_opt_values oNoShowPolicyURL, oSigKeyserverURL, oUseEmbeddedFilename, + oNoUseEmbeddedFilename, oComment, oDefaultComment, oNoComments, @@ -605,6 +606,7 @@ static ARGPARSE_OPTS opts[] = { { oLoggerFile, "logger-file",2, "@" }, #endif /* __riscos__ */ { oUseEmbeddedFilename, "use-embedded-filename", 0, "@" }, + { oNoUseEmbeddedFilename, "no-use-embedded-filename", 0, "@" }, { oUtf8Strings, "utf8-strings", 0, "@" }, { oNoUtf8Strings, "no-utf8-strings", 0, "@" }, { oWithFingerprint, "with-fingerprint", 0, "@" }, @@ -1926,6 +1928,7 @@ main( int argc, char **argv ) break; case oSigKeyserverURL: add_keyserver_url(pargs.r.ret_str,0); break; case oUseEmbeddedFilename: opt.use_embedded_filename = 1; break; + case oNoUseEmbeddedFilename: opt.use_embedded_filename = 0; break; case oComment: if(pargs.r.ret_str[0]) append_to_strlist(&opt.comments,pargs.r.ret_str); -- cgit v1.2.3