security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-05 12:31:50 +01:00
Code Activity

* keygen.c (proc_parameter_file): Default key and subkey usage flags to

Browse Source 
algo capabilities if parameter file doesn't specify them. Noted by Timo
Schulz.
This commit is contained in:
David Shaw 2005-10-26 16:09:23 +00:00
parent 4a58bbbb8a
commit b9f1815947
2 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2005-10-26 David Shaw <dshaw@jabberwocky.com>
* keygen.c (proc_parameter_file): Default key and subkey usage
flags to algo capabilities if parameter file doesn't specify them.
Noted by Timo Schulz.
2005-10-18 Werner Koch <wk@g10code.com> 2005-10-18 Werner Koch <wk@g10code.com>
* cardglue.c (pin_cb): Fixed prompt for repeated PIN. Return * cardglue.c (pin_cb): Fixed prompt for repeated PIN. Return

36
g10/keygen.c
View File

@ -1955,7 +1955,7 @@ parse_parameter_usage (const char *fname,
} }
} }
r->u.usage = use; r->u.usage = use;
return 0; return 1;
} }
static int static int
@ -2062,14 +2062,14 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
const char *s1, *s2, *s3; const char *s1, *s2, *s3;
size_t n; size_t n;
char *p; char *p;
int have_user_id=0; int have_user_id=0,err,algo;
/* Check that we have all required parameters. */ /* Check that we have all required parameters. */
r = get_parameter( para, pKEYTYPE ); r = get_parameter( para, pKEYTYPE );
if(r) if(r)
{ {
if(check_pubkey_algo2(get_parameter_algo(para,pKEYTYPE), algo=get_parameter_algo(para,pKEYTYPE);
PUBKEY_USAGE_SIG)) if(check_pubkey_algo2(algo,PUBKEY_USAGE_SIG))
{ {
log_error("%s:%d: invalid algorithm\n", fname, r->lnr ); log_error("%s:%d: invalid algorithm\n", fname, r->lnr );
return -1; return -1;
@ -2081,19 +2081,41 @@ proc_parameter_file( struct para_data_s *para, const char *fname,
return -1; return -1;
} }
if (parse_parameter_usage (fname, para, pKEYUSAGE)) err=parse_parameter_usage (fname, para, pKEYUSAGE);
if(err==0)
{
/* Default to algo capabilities if key-usage is not provided */
r=xmalloc_clear(sizeof(*r));
r->key=pKEYUSAGE;
r->u.usage=openpgp_pk_algo_usage(algo);
r->next=para;
para=r;
}
else if(err==-1)
return -1; return -1;
r = get_parameter( para, pSUBKEYTYPE ); r = get_parameter( para, pSUBKEYTYPE );
if(r) if(r)
{ {
if(check_pubkey_algo( get_parameter_algo( para, pSUBKEYTYPE))) algo=get_parameter_algo( para, pSUBKEYTYPE);
if(check_pubkey_algo(algo))
{ {
log_error("%s:%d: invalid algorithm\n", fname, r->lnr ); log_error("%s:%d: invalid algorithm\n", fname, r->lnr );
return -1; return -1;
} }
if(parse_parameter_usage (fname, para, pSUBKEYUSAGE)) err=parse_parameter_usage (fname, para, pSUBKEYUSAGE);
if(err==0)
{
/* Default to algo capabilities if subkey-usage is not
provided */
r=xmalloc_clear(sizeof(*r));
r->key=pSUBKEYUSAGE;
r->u.usage=openpgp_pk_algo_usage(algo);
r->next=para;
para=r;
}
else if(err==-1)
return -1; return -1;
} }