security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-23 10:29:58 +01:00
Code Activity

* trustdb.h, trustdb.c (trust_letter): Make static. (get_ownertrust_info,

Browse Source 
get_validity_info): Don't mask the trust level twice.

* armor.c (armor_filter): Comment about PGP's end of line tab problem.
This commit is contained in:
David Shaw 2003-01-10 16:46:18 +00:00
parent 4b7ff5da2b
commit 97e93b7e18
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
g10/ChangeLog
View File

@ -1,3 +1,12 @@
2003-01-10 David Shaw <dshaw@jabberwocky.com>
* trustdb.h, trustdb.c (trust_letter): Make static.
(get_ownertrust_info, get_validity_info): Don't mask the trust
level twice.
* armor.c (armor_filter): Comment about PGP's end of line tab
problem.
2003-01-08 David Shaw <dshaw@jabberwocky.com> 2003-01-08 David Shaw <dshaw@jabberwocky.com>
* packet.h, pkclist.c (build_pk_list), free-packet.c * packet.h, pkclist.c (build_pk_list), free-packet.c

6
g10/armor.c
View File

@ -1,5 +1,6 @@
/* armor.c - Armor flter /* armor.c - Armor flter
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -871,6 +872,9 @@ armor_filter( void *opaque, int control,
hashes &= 1|2|4|8; hashes &= 1|2|4|8;
if( !hashes ) { if( !hashes ) {
hashes |= 4; /* default to MD 5 */ hashes |= 4; /* default to MD 5 */
/* This is non-ideal since PGP 5-8 have the same
end-of-line bugs as PGP 2. However, we only
enable pgp2mode if there is no Hash: header. */
if( opt.pgp2_workarounds ) if( opt.pgp2_workarounds )
afx->pgp2mode = 1; afx->pgp2mode = 1;
} }

15
g10/trustdb.c
View File

@ -1,5 +1,6 @@
/* trustdb.c /* trustdb.c
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -423,7 +424,7 @@ init_trustdb()
* This function returns a letter for a trustvalue Trust flags * This function returns a letter for a trustvalue Trust flags
* are ignore. * are ignore.
*/ */
int static int
trust_letter (unsigned int value) trust_letter (unsigned int value)
{ {
switch( (value & TRUST_MASK) ) switch( (value & TRUST_MASK) )
@ -557,7 +558,7 @@ get_ownertrust_info (PKT_public_key *pk)
int c; int c;
otrust = get_ownertrust (pk); otrust = get_ownertrust (pk);
c = trust_letter( (otrust & TRUST_MASK) ); c = trust_letter( otrust );
if( !c ) if( !c )
c = '?'; c = '?';
return c; return c;
@ -651,7 +652,7 @@ update_validity (PKT_public_key *pk, PKT_user_id *uid,
ulong recno; ulong recno;
byte namehash[20]; byte namehash[20];
if( uid->attrib_data ) if(uid->attrib_data)
rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len); rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len);
else else
rmd160_hash_buffer (namehash, uid->name, uid->len ); rmd160_hash_buffer (namehash, uid->name, uid->len );
@ -798,7 +799,7 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid)
if(uid) if(uid)
{ {
if( uid->attrib_data ) if(uid->attrib_data)
rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len); rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len);
else else
rmd160_hash_buffer (namehash, uid->name, uid->len ); rmd160_hash_buffer (namehash, uid->name, uid->len );
@ -903,7 +904,7 @@ get_validity_info (PKT_public_key *pk, PKT_user_id *uid)
return 'd'; return 'd';
if( trustlevel & TRUST_FLAG_REVOKED ) if( trustlevel & TRUST_FLAG_REVOKED )
return 'r'; return 'r';
c = trust_letter ( (trustlevel & TRUST_MASK) ); c = trust_letter ( trustlevel );
if( !c ) if( !c )
c = '?'; c = '?';
return c; return c;
@ -919,7 +920,7 @@ get_validity_counts (PKT_public_key *pk, PKT_user_id *uid)
if(pk==NULL || uid==NULL) if(pk==NULL || uid==NULL)
BUG(); BUG();
if( uid->attrib_data ) if(uid->attrib_data)
rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len); rmd160_hash_buffer (namehash,uid->attrib_data,uid->attrib_len);
else else
rmd160_hash_buffer (namehash, uid->name, uid->len ); rmd160_hash_buffer (namehash, uid->name, uid->len );

5
g10/trustdb.h
View File

@ -1,5 +1,6 @@
/* trustdb.h - Trust database /* trustdb.h - Trust database
* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
* Free Software Foundation, Inc.
* *
* This file is part of GnuPG. * This file is part of GnuPG.
* *
@ -45,8 +46,6 @@ int setup_trustdb( int level, const char *dbname );
void init_trustdb( void ); void init_trustdb( void );
void sync_trustdb( void ); void sync_trustdb( void );
int trust_letter( unsigned value );
void revalidation_mark (void); void revalidation_mark (void);
int is_disabled(void *dummy,u32 *keyid); int is_disabled(void *dummy,u32 *keyid);