security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-09-21 15:01:41 +02:00
Code Activity

* gpgsm.c, gpgsm.h: New option --debug-no-path-validation.

Browse Source 
* certpath.c (gpgsm_validate_path): Use it here instead of the
debug flag hack.

* certpath.c (check_cert_policy): Return No_Policy_Match if the
policy file could not be opened.
This commit is contained in:
Werner Koch 2002-06-24 14:34:52 +00:00
parent 42cf865350
commit 640688c4e2
5 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sm/ChangeLog
View File

@ -1,3 +1,12 @@
2002-06-24 Werner Koch <wk@gnupg.org>
* gpgsm.c, gpgsm.h: New option --debug-no-path-validation.
* certpath.c (gpgsm_validate_path): Use it here instead of the
debug flag hack.
* certpath.c (check_cert_policy): Return No_Policy_Match if the
policy file could not be opened.
2002-06-20 Werner Koch <wk@gnupg.org> 2002-06-20 Werner Koch <wk@gnupg.org>
* certlist.c (gpgsm_add_to_certlist): Fixed locating of a * certlist.c (gpgsm_add_to_certlist): Fixed locating of a

4
sm/certchain.c
View File

@ -127,7 +127,7 @@ check_cert_policy (KsbaCert cert)
log_error ("failed to open `%s': %s\n", log_error ("failed to open `%s': %s\n",
opt.policy_file, strerror (errno)); opt.policy_file, strerror (errno));
xfree (policies); xfree (policies);
return GNUPG_Configuration_Error; return GNUPG_No_Policy_Match;
} }
for (;;) for (;;)
@ -326,7 +326,7 @@ gpgsm_validate_path (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
if (r_exptime) if (r_exptime)
*r_exptime = 0; *r_exptime = 0;
if ((opt.debug & 4096)) if (opt.no_path_validation)
{ {
log_info ("WARNING: bypassing path validation\n"); log_info ("WARNING: bypassing path validation\n");
return 0; return 0;

4
sm/certpath.c
View File

@ -127,7 +127,7 @@ check_cert_policy (KsbaCert cert)
log_error ("failed to open `%s': %s\n", log_error ("failed to open `%s': %s\n",
opt.policy_file, strerror (errno)); opt.policy_file, strerror (errno));
xfree (policies); xfree (policies);
return GNUPG_Configuration_Error; return GNUPG_No_Policy_Match;
} }
for (;;) for (;;)
@ -326,7 +326,7 @@ gpgsm_validate_path (CTRL ctrl, KsbaCert cert, time_t *r_exptime)
if (r_exptime) if (r_exptime)
*r_exptime = 0; *r_exptime = 0;
if ((opt.debug & 4096)) if (opt.no_path_validation)
{ {
log_info ("WARNING: bypassing path validation\n"); log_info ("WARNING: bypassing path validation\n");
return 0; return 0;

4
sm/gpgsm.c
View File

@ -82,6 +82,7 @@ enum cmd_and_opt_values {
oDebug, oDebug,
oDebugAll, oDebugAll,
oDebugWait, oDebugWait,
oDebugNoPathValidation,
oLogFile, oLogFile,
oEnableSpecialFilenames, oEnableSpecialFilenames,
@ -302,6 +303,7 @@ static ARGPARSE_OPTS opts[] = {
{ oDebug, "debug" ,4|16, "@"}, { oDebug, "debug" ,4|16, "@"},
{ oDebugAll, "debug-all" ,0, "@"}, { oDebugAll, "debug-all" ,0, "@"},
{ oDebugWait, "debug-wait" ,1, "@"}, { oDebugWait, "debug-wait" ,1, "@"},
{ oDebugNoPathValidation, "debug-no-path-validation" ,1, "@"},
{ oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") }, { oStatusFD, "status-fd" ,1, N_("|FD|write status info to this FD") },
{ aDummy, "no-comment", 0, "@"}, { aDummy, "no-comment", 0, "@"},
{ aDummy, "completes-needed", 1, "@"}, { aDummy, "completes-needed", 1, "@"},
@ -844,6 +846,8 @@ main ( int argc, char **argv)
case oDebug: opt.debug |= pargs.r.ret_ulong; break; case oDebug: opt.debug |= pargs.r.ret_ulong; break;
case oDebugAll: opt.debug = ~0; break; case oDebugAll: opt.debug = ~0; break;
case oDebugWait: debug_wait = pargs.r.ret_int; break; case oDebugWait: debug_wait = pargs.r.ret_int; break;
case oDebugNoPathValidation: opt.no_path_validation = 1; break;
case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break; case oStatusFD: ctrl.status_fd = pargs.r.ret_int; break;
case oLoggerFD: log_set_fd (pargs.r.ret_int ); break; case oLoggerFD: log_set_fd (pargs.r.ret_int ); break;

2
sm/gpgsm.h
View File

@ -78,7 +78,7 @@ struct {
char *policy_file; /* full pathname of policy file */ char *policy_file; /* full pathname of policy file */
int no_policy_check; /* ignore certificate policies */ int no_policy_check; /* ignore certificate policies */
int no_path_validation; /* Bypass all cert path validity tests */
} opt; } opt;