diff options
| -rw-r--r-- | g10/ChangeLog | 13 | ||||
| -rw-r--r-- | g10/g10.c | 4 | ||||
| -rw-r--r-- | g10/gpgv.c | 1 | ||||
| -rw-r--r-- | g10/trustdb.c | 8 |
4 files changed, 20 insertions, 6 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 58350562d..c98824291 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,16 @@ +2003-02-26 David Shaw <[email protected]> + + * trustdb.c (validate_keys): Mask the ownertrust when building the + list of fully valid keys so that disabled keys are still counted + in the web of trust. + + * gpgv.c (main): Fix bug #113 - gpgv should accept the + --ignore-time-conflict option. + + * g10.c (main): Use 3DES for the s2k cipher in --openpgp mode. + Double the amount of secure memory to 32k (keys are getting bigger + these days). + 2003-02-22 David Shaw <[email protected]> * g10.c (main): --openpgp disables --pgpX. @@ -1173,7 +1173,7 @@ main( int argc, char **argv ) } #endif /* initialize the secure memory. */ - secmem_init( 16384 ); + secmem_init( 32768 ); maybe_setuid = 0; /* Okay, we are now working under our real uid */ @@ -1453,7 +1453,7 @@ main( int argc, char **argv ) opt.def_compress_algo = 1; opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_digest_algo = DIGEST_ALGO_SHA1; - opt.s2k_cipher_algo = CIPHER_ALGO_CAST5; + opt.s2k_cipher_algo = CIPHER_ALGO_3DES; opt.pgp2 = 0; opt.pgp6 = 0; opt.pgp7 = 0; diff --git a/g10/gpgv.c b/g10/gpgv.c index 5ab1ed1b6..38e42066f 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -190,6 +190,7 @@ main( int argc, char **argv ) case oStatusFD: set_status_fd( pargs.r.ret_int ); break; case oLoggerFD: log_set_logfile( NULL, pargs.r.ret_int ); break; case oHomedir: set_homedir (pargs.r.ret_str); break; + case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break; default : pargs.err = 2; break; } } diff --git a/g10/trustdb.c b/g10/trustdb.c index 402dc9402..f92c91c54 100644 --- a/g10/trustdb.c +++ b/g10/trustdb.c @@ -1709,8 +1709,9 @@ validate_keys (int interactive) k = new_key_item (); k->kid[0]=kid[0]; k->kid[1]=kid[1]; - k->ownertrust = get_ownertrust (kar->keyblock - ->pkt->pkt.public_key); + k->ownertrust = (get_ownertrust (kar->keyblock + ->pkt->pkt.public_key) + & TRUST_MASK); k->next = klist; klist = k; break; @@ -1744,7 +1745,6 @@ validate_keys (int interactive) do_sync (); pending_check_trustdb = 0; } + return rc; } - - |