security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-02-22 19:58:29 +01:00
Code Activity

* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Use the

Browse Source 
default sig expire value when signing in batchmode.
This commit is contained in:
David Shaw 2005-05-06 13:03:22 +00:00
parent 89055cca85
commit 10f51e0714
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2005-05-06 David Shaw <dshaw@jabberwocky.com>
* sign.c (sign_file, clearsign_file, sign_symencrypt_file): Use
the default sig expire value when signing in batchmode.
2005-05-05 David Shaw <dshaw@jabberwocky.com> 2005-05-05 David Shaw <dshaw@jabberwocky.com>
* Makefile.am, packet.h, main.h, comment.c: Remove comment.c. We * Makefile.am, packet.h, main.h, comment.c: Remove comment.c. We

12
g10/sign.c
View File

@ -744,9 +744,9 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
&& (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek))) && (rc=setup_symkey(&efx.symkey_s2k,&efx.symkey_dek)))
goto leave; goto leave;
if(!opt.force_v3_sigs && !opt.batch && !RFC1991) if(!opt.force_v3_sigs && !RFC1991)
{ {
if(opt.ask_sig_expire) if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire); duration=ask_expire_interval(1,opt.def_sig_expire);
else else
duration=parse_expire_string(opt.def_sig_expire)*86400L; duration=parse_expire_string(opt.def_sig_expire)*86400L;
@ -1014,9 +1014,9 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
memset( &afx, 0, sizeof afx); memset( &afx, 0, sizeof afx);
init_packet( &pkt ); init_packet( &pkt );
if(!opt.force_v3_sigs && !opt.batch && !RFC1991) if(!opt.force_v3_sigs && !RFC1991)
{ {
if(opt.ask_sig_expire) if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire); duration=ask_expire_interval(1,opt.def_sig_expire);
else else
duration=parse_expire_string(opt.def_sig_expire)*86400L; duration=parse_expire_string(opt.def_sig_expire)*86400L;
@ -1173,9 +1173,9 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
memset( &cfx, 0, sizeof cfx); memset( &cfx, 0, sizeof cfx);
init_packet( &pkt ); init_packet( &pkt );
if(!opt.force_v3_sigs && !opt.batch && !RFC1991) if(!opt.force_v3_sigs && !RFC1991)
{ {
if(opt.ask_sig_expire) if(opt.ask_sig_expire && !opt.batch)
duration=ask_expire_interval(1,opt.def_sig_expire); duration=ask_expire_interval(1,opt.def_sig_expire);
else else
duration=parse_expire_string(opt.def_sig_expire)*86400L; duration=parse_expire_string(opt.def_sig_expire)*86400L;