mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
fix off-by-one in building attribute subpackets
change default compression to 1 add ask-sig-expire and ask-cert-expire (--expert was getting absurdly overloaded) permit v3 subkeys use --expert to protect adding multiple photo ids and adding photos to a v3 key
This commit is contained in:
parent
bfec9806d2
commit
7997bba7a9
8 changed files with 106 additions and 19 deletions
|
@ -564,7 +564,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr,
|
|||
if( fname && filenames->next && (!detached || encryptflag) )
|
||||
log_bug("multiple files can only be detached signed");
|
||||
|
||||
if(opt.expert && !opt.pgp2 && !opt.batch &&
|
||||
if(opt.ask_sig_expire && !opt.pgp2 && !opt.batch &&
|
||||
!opt.force_v3_sigs && !old_style)
|
||||
duration=ask_expire_interval(1);
|
||||
|
||||
|
@ -742,7 +742,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile )
|
|||
memset( &afx, 0, sizeof afx);
|
||||
init_packet( &pkt );
|
||||
|
||||
if(opt.expert && !opt.pgp2 && !opt.batch &&
|
||||
if(opt.ask_sig_expire && !opt.pgp2 && !opt.batch &&
|
||||
!opt.force_v3_sigs && !old_style)
|
||||
duration=ask_expire_interval(1);
|
||||
|
||||
|
@ -886,7 +886,7 @@ sign_symencrypt_file (const char *fname, STRLIST locusr)
|
|||
memset( &cfx, 0, sizeof cfx);
|
||||
init_packet( &pkt );
|
||||
|
||||
if(opt.expert && !opt.batch && !opt.force_v3_sigs && !old_style)
|
||||
if(opt.ask_sig_expire && !opt.batch && !opt.force_v3_sigs && !old_style)
|
||||
duration=ask_expire_interval(1);
|
||||
|
||||
rc = build_sk_list (locusr, &sk_list, 1, PUBKEY_USAGE_SIG);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue