security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00
Code Activity

* parse-packet.c (parse_signature): Minor fix - signatures should expire

Browse source 
at their expiration time and not one second later.

* keygen.c (proc_parameter_file): Allow specifying preferences string
(i.e. "s5 s2 z1 z2", etc) in a batchmode key generation file.

* keyedit.c (keyedit_menu): Print standard error message when signing a
revoked key (no new translation).

* getkey.c (merge_selfsigs): Get the default set of key prefs from the
real (not attribute) primary uid.
This commit is contained in:
David Shaw 2002-04-14 01:27:11 +00:00
parent 9d7b26c784
commit 9ef1a80f8d
5 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
g10/keygen.c
View file

@ -49,6 +49,7 @@ enum para_name {
pNAMEREAL,
pNAMEEMAIL,
pNAMECOMMENT,
pPREFERENCES,
pUSERID,
pEXPIREDATE,
pKEYEXPIRE, /* in n seconds */
@ -253,7 +254,7 @@ keygen_set_std_prefs (const char *string)
else if (isspace (*s))
s2 = s+1;
else {
log_info (_("invalid character in string\n"));
log_info (_("invalid character in preference string\n"));
return -1;
}
}
@ -1458,6 +1459,9 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
}
}
/* Set preferences, if any. */
keygen_set_std_prefs(get_parameter_value( para, pPREFERENCES ));
/* make DEK and S2K from the Passphrase */
r = get_parameter( para, pPASSPHRASE );
if( r && *r->u.value ) {
@ -1538,6 +1542,7 @@ read_parameter_file( const char *fname )
{ "Name-Comment", pNAMECOMMENT },
{ "Expire-Date", pEXPIREDATE },
{ "Passphrase", pPASSPHRASE },
{ "Preferences", pPREFERENCES },
{ NULL, 0 }
};
FILE *fp;