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

1 files changed, 2 insertions, 0 deletions

diff --git a/g10/g10.c b/g10/g10.c
index 07816a284..dd0c2b7af 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -858,6 +858,8 @@ static void add_group(char *string)
       return;
     }
 
+  trim_trailing_ws(name,strlen(name));
+
   /* Break apart the values */
   while ((value= strsep(&string," \t")))
     {