diff options
| author | David Shaw <[email protected]> | 2005-05-05 19:21:40 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2005-05-05 19:21:40 +0000 |
| commit | c71639cfffc8796d3109afff1340cd8fac1504f6 (patch) | |
| tree | d8bfb2c6bc946b9e3ae62f62506f17efce152680 /g10/main.h | |
| parent | * gpg.sgml: Clarify --min-cert-level a bit. (diff) | |
| download | gnupg-c71639cfffc8796d3109afff1340cd8fac1504f6.tar.gz gnupg-c71639cfffc8796d3109afff1340cd8fac1504f6.zip | |
* options.h, g10.c (main): Add new --default-sig-expire and
--default-cert-expire options. Suggested by Florian Weimer.
* main.h, keygen.c (parse_expire_string, ask_expire_interval): Use
defaults passed in, or "0" to control what default expiration is.
* keyedit.c (sign_uids), sign.c (sign_file, clearsign_file,
sign_symencrypt_file): Call them here, so that default expiration
is used when --ask-xxxxx-expire is off.
Diffstat (limited to '')
| -rw-r--r-- | g10/main.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/g10/main.h b/g10/main.h index fed9452d2..9eb1f9635 100644 --- a/g10/main.h +++ b/g10/main.h @@ -1,6 +1,6 @@ /* main.h - * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, - * 2004 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, + * 2005 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -165,7 +165,8 @@ void keyedit_menu( const char *username, STRLIST locusr, void show_basic_key_info (KBNODE keyblock); /*-- keygen.c --*/ -u32 ask_expire_interval(int object); +int parse_expire_string(const char *string); +u32 ask_expire_interval(int object,const char *def_expire); u32 ask_expiredate(void); void generate_keypair( const char *fname, const char *card_serialno, const char *backup_encryption_dir ); |