security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-08 12:44:23 +01:00
Code Activity

* g10.c (add_group): Trim whitespace after a group name so it does not

Browse Source 
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.
This commit is contained in:
David Shaw 2003-01-16 19:20:10 +00:00
parent b7ea66ef37
commit 8220f3fd4d
5 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
g10/ChangeLog
View File

@ -1,3 +1,20 @@
2003-01-16 David Shaw <dshaw@jabberwocky.com>
* 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.
2003-01-15 David Shaw <dshaw@jabberwocky.com> 2003-01-15 David Shaw <dshaw@jabberwocky.com>
* trustdb.c (init_trustdb, get_validity): Don't use a changed * trustdb.c (init_trustdb, get_validity): Don't use a changed

2
g10/g10.c
View File

@ -858,6 +858,8 @@ static void add_group(char *string)
return; return;
} }
trim_trailing_ws(name,strlen(name));
/* Break apart the values */ /* Break apart the values */
while ((value= strsep(&string," \t"))) while ((value= strsep(&string," \t")))
{ {

8
g10/options.skel
View File

@ -1,8 +1,8 @@
These first three lines are not copied to the gpg.conf file in # These first three lines are not copied to the gpg.conf file in
the users home directory. # the users home directory.
$Id$ # $Id$
# Options for GnuPG # Options for GnuPG
# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. # Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
# #
# This file is free software; as a special exception the author gives # This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without # unlimited permission to copy and/or distribute it, with or without

2
g10/sig-check.c
View File

@ -71,7 +71,7 @@ signature_check2( PKT_signature *sig, MD_HANDLE digest,
if(!md_algo_present(digest,sig->digest_algo)) { if(!md_algo_present(digest,sig->digest_algo)) {
log_info(_("WARNING: signature digest conflict in message\n")); log_info(_("WARNING: signature digest conflict in message\n"));
rc=G10ERR_BAD_SIGN; rc=G10ERR_GENERAL;
} }
else if( get_pubkey( pk, sig->keyid ) ) else if( get_pubkey( pk, sig->keyid ) )
rc = G10ERR_NO_PUBKEY; rc = G10ERR_NO_PUBKEY;

4
g10/sign.c
View File

@ -974,8 +974,8 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
} }
if ( DBG_HASHING ) if ( DBG_HASHING )
md_start_debug( textmd, "clearsign" ); md_start_debug( textmd, "clearsign" );
copy_clearsig_text( out, inp, textmd, copy_clearsig_text( out, inp, textmd, !opt.not_dash_escaped,
!opt.not_dash_escaped, opt.escape_from, old_style ); opt.escape_from, (old_style && only_md5) );
/* fixme: check for read errors */ /* fixme: check for read errors */
/* now write the armor */ /* now write the armor */