security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* trustdb.c (validate_keys): Mask the ownertrust when building the list of

Browse Source 
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).
This commit is contained in:
David Shaw 2003-02-26 20:40:34 +00:00
parent 838fe750bb
commit 8655a545af
4 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
g10/ChangeLog
View File

@ -1,3 +1,16 @@
2003-02-26 David Shaw <dshaw@jabberwocky.com>
* 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 <dshaw@jabberwocky.com> 2003-02-22 David Shaw <dshaw@jabberwocky.com>
* g10.c (main): --openpgp disables --pgpX. * g10.c (main): --openpgp disables --pgpX.

4
g10/g10.c
View File

@ -1173,7 +1173,7 @@ main( int argc, char **argv )
} }
#endif #endif
/* initialize the secure memory. */ /* initialize the secure memory. */
secmem_init( 16384 ); secmem_init( 32768 );
maybe_setuid = 0; maybe_setuid = 0;
/* Okay, we are now working under our real uid */ /* Okay, we are now working under our real uid */
@ -1453,7 +1453,7 @@ main( int argc, char **argv )
opt.def_compress_algo = 1; opt.def_compress_algo = 1;
opt.s2k_mode = 3; /* iterated+salted */ opt.s2k_mode = 3; /* iterated+salted */
opt.s2k_digest_algo = DIGEST_ALGO_SHA1; 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.pgp2 = 0;
opt.pgp6 = 0; opt.pgp6 = 0;
opt.pgp7 = 0; opt.pgp7 = 0;

1
g10/gpgv.c
View File

@ -190,6 +190,7 @@ main( int argc, char **argv )
case oStatusFD: set_status_fd( pargs.r.ret_int ); break; case oStatusFD: set_status_fd( pargs.r.ret_int ); break;
case oLoggerFD: log_set_logfile( NULL, 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 oHomedir: set_homedir (pargs.r.ret_str); break;
case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
default : pargs.err = 2; break; default : pargs.err = 2; break;
} }
} }

8
g10/trustdb.c
View File

@ -1709,8 +1709,9 @@ validate_keys (int interactive)
k = new_key_item (); k = new_key_item ();
k->kid[0]=kid[0]; k->kid[0]=kid[0];
k->kid[1]=kid[1]; k->kid[1]=kid[1];
k->ownertrust = get_ownertrust (kar->keyblock k->ownertrust = (get_ownertrust (kar->keyblock
->pkt->pkt.public_key); ->pkt->pkt.public_key)
& TRUST_MASK);
k->next = klist; k->next = klist;
klist = k; klist = k;
break; break;
@ -1744,7 +1745,6 @@ validate_keys (int interactive)
do_sync (); do_sync ();
pending_check_trustdb = 0; pending_check_trustdb = 0;
} }
return rc; return rc;
} }