From 8220f3fd4d0e09a3d381886c610b56240ca848b8 Mon Sep 17 00:00:00 2001 From: David Shaw Date: Thu, 16 Jan 2003 19:20:10 +0000 Subject: * g10.c (add_group): Trim whitespace after a group name so it does not matter where the user puts the = sign. * options.skel: Comment out the first three lines in case someone manually copies the skel file to their homedir. * sign.c (clearsign_file): Only use pgp2mode with v3 keys and MD5. This matches what we do when decoding such messages and prevents creating a message (v3+RIPEMD/160) that we can't verify. * sig-check.c (signature_check2): Use G10ERR_GENERAL as the error for signature digest conflict. BAD_SIGN implies that a signature was checked and we may try and print out a user ID for a key that doesn't exist. --- g10/sign.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'g10/sign.c') diff --git a/g10/sign.c b/g10/sign.c index c08b98a63..92342eaea 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -974,8 +974,8 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) } if ( DBG_HASHING ) md_start_debug( textmd, "clearsign" ); - copy_clearsig_text( out, inp, textmd, - !opt.not_dash_escaped, opt.escape_from, old_style ); + copy_clearsig_text( out, inp, textmd, !opt.not_dash_escaped, + opt.escape_from, (old_style && only_md5) ); /* fixme: check for read errors */ /* now write the armor */ -- cgit