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

* certreqgen.c (read_parameters): Improved error handling.

Browse Source 
(gpgsm_genkey): Print error message.
This commit is contained in:
Werner Koch 2002-06-17 10:11:50 +00:00
parent 469dc1043d
commit dfcdec0db2
2 changed files with 37 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sm/ChangeLog
View File

@ -1,3 +1,8 @@
2002-06-17 Werner Koch <wk@gnupg.org>
* certreqgen.c (read_parameters): Improved error handling.
(gpgsm_genkey): Print error message.
2002-06-13 Werner Koch <wk@gnupg.org> 2002-06-13 Werner Koch <wk@gnupg.org>
* gpgsm.c (main): New option --log-file. * gpgsm.c (main): New option --log-file.

43
sm/certreqgen.c
View File

@ -225,7 +225,7 @@ get_parameter_uint (struct para_data_s *para, enum para_name key)
/* Read the certificate generation parameters from FP and genereate /* Read the certificate generation parameters from FP and generate
(all) certificate requests. */ (all) certificate requests. */
static int static int
read_parameters (FILE *fp, KsbaWriter writer) read_parameters (FILE *fp, KsbaWriter writer)
@ -244,7 +244,7 @@ read_parameters (FILE *fp, KsbaWriter writer)
char line[1024], *p; char line[1024], *p;
const char *err = NULL; const char *err = NULL;
struct para_data_s *para, *r; struct para_data_s *para, *r;
int i; int i, rc = 0, any = 0;
struct reqgen_ctrl_s outctrl; struct reqgen_ctrl_s outctrl;
memset (&outctrl, 0, sizeof (outctrl)); memset (&outctrl, 0, sizeof (outctrl));
@ -285,8 +285,10 @@ read_parameters (FILE *fp, KsbaWriter writer)
outctrl.dryrun = 1; outctrl.dryrun = 1;
else if (!ascii_strcasecmp( keyword, "%commit")) else if (!ascii_strcasecmp( keyword, "%commit"))
{ {
proc_parameters (para, &outctrl); rc = proc_parameters (para, &outctrl);
/*FIXME: what about error handling */ if (rc)
goto leave;
any = 1;
release_parameter_list (para); release_parameter_list (para);
para = NULL; para = NULL;
} }
@ -330,7 +332,10 @@ read_parameters (FILE *fp, KsbaWriter writer)
if (keywords[i].key == pKEYTYPE && para) if (keywords[i].key == pKEYTYPE && para)
{ {
proc_parameters (para, &outctrl); rc = proc_parameters (para, &outctrl);
if (rc)
goto leave;
any = 1;
release_parameter_list (para); release_parameter_list (para);
para = NULL; para = NULL;
} }
@ -359,17 +364,29 @@ read_parameters (FILE *fp, KsbaWriter writer)
} }
if (err) if (err)
log_error ("line %d: %s\n", outctrl.lnr, err); {
log_error ("line %d: %s\n", outctrl.lnr, err);
rc = GNUPG_General_Error;
}
else if (ferror(fp)) else if (ferror(fp))
log_error ("line %d: read error: %s\n", outctrl.lnr, strerror(errno) ); {
log_error ("line %d: read error: %s\n", outctrl.lnr, strerror(errno) );
rc = GNUPG_General_Error;
}
else if (para) else if (para)
{ {
proc_parameters (para, &outctrl); rc = proc_parameters (para, &outctrl);
/*FIXME: what about error handling */ if (rc)
goto leave;
any = 1;
} }
if (!rc && !any)
rc = GNUPG_No_Data;
leave:
release_parameter_list (para); release_parameter_list (para);
return 0; return rc;
} }
/* check whether there are invalid characters in the email address S */ /* check whether there are invalid characters in the email address S */
@ -658,7 +675,11 @@ gpgsm_genkey (CTRL ctrl, int in_fd, FILE *out_fp)
rc = read_parameters (in_fp, writer); rc = read_parameters (in_fp, writer);
if (rc) if (rc)
goto leave; {
log_error ("error creating certificate request: %s\n",
gnupg_strerror (rc));
goto leave;
}
rc = gpgsm_finish_writer (b64writer); rc = gpgsm_finish_writer (b64writer);
if (rc) if (rc)