security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-07-01 02:42:44 +02:00
Code Activity

* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire): Remove

Browse Source 
the need for ask_expiredate().
This commit is contained in:
David Shaw 2007-01-31 19:42:48 +00:00
parent e2fdff56fc
commit efef00aed3
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
g10/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-31 David Shaw <dshaw@jabberwocky.com>
* main.h, keygen.c (ask_expiredate), keyedit.c (menu_expire):
Remove the need for ask_expiredate().
2007-01-30 David Shaw <dshaw@jabberwocky.com> 2007-01-30 David Shaw <dshaw@jabberwocky.com>
* keygen.c (make_backsig, write_direct_sig, write_selfsigs) * keygen.c (make_backsig, write_direct_sig, write_selfsigs)

5
g10/keyedit.c
View File

@ -3540,7 +3540,10 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock )
no_primary_warning(pub_keyblock); no_primary_warning(pub_keyblock);
} }
expiredate = ask_expiredate(); expiredate=ask_expire_interval(0,NULL);
if(expiredate)
expiredate+=make_timestamp();
node = find_kbnode( sec_keyblock, PKT_SECRET_KEY ); node = find_kbnode( sec_keyblock, PKT_SECRET_KEY );
sk = copy_secret_key( NULL, node->pkt->pkt.secret_key); sk = copy_secret_key( NULL, node->pkt->pkt.secret_key);

8
g10/keygen.c
View File

@ -1699,14 +1699,6 @@ ask_expire_interval(int object,const char *def_expire)
return interval; return interval;
} }
u32
ask_expiredate()
{
u32 x = ask_expire_interval(0,NULL);
return x? make_timestamp() + x : 0;
}
static char * static char *
ask_user_id( int mode ) ask_user_id( int mode )
{ {

1
g10/main.h
View File

@ -172,7 +172,6 @@ void show_basic_key_info (KBNODE keyblock);
/*-- keygen.c --*/ /*-- keygen.c --*/
u32 parse_expire_string(const char *string); u32 parse_expire_string(const char *string);
u32 ask_expire_interval(int object,const char *def_expire); u32 ask_expire_interval(int object,const char *def_expire);
u32 ask_expiredate(void);
void generate_keypair( const char *fname, const char *card_serialno, void generate_keypair( const char *fname, const char *card_serialno,
const char *backup_encryption_dir ); const char *backup_encryption_dir );
int keygen_set_std_prefs (const char *string,int personal); int keygen_set_std_prefs (const char *string,int personal);