security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

* scdaemon.c, scdaemon.h: New options --allow-admin and --deny-admin.

Browse Source 
* app-openpgp.c (verify_chv3): Check it here.
This commit is contained in:
Werner Koch 2003-12-01 10:54:09 +00:00
parent 6b7af47bcc
commit 7134af9fdb
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scd/ChangeLog
View File

@ -1,3 +1,8 @@
2003-11-17 Werner Koch <wk@gnupg.org>
* scdaemon.c, scdaemon.h: New options --allow-admin and --deny-admin.
* app-openpgp.c (verify_chv3): Check it here.
2003-11-12 Werner Koch <wk@gnupg.org> 2003-11-12 Werner Koch <wk@gnupg.org>
Adjusted for API changes in Libksba. Adjusted for API changes in Libksba.

6
scd/app-openpgp.c
View File

@ -569,6 +569,12 @@ verify_chv3 (APP app,
{ {
int rc = 0; int rc = 0;
if (!opt.allow_admin)
{
log_info ("access to admin commands is not configured\n");
return gpg_error (GPG_ERR_EACCES);
}
if (!app->did_chv3) if (!app->did_chv3)
{ {
char *pinvalue; char *pinvalue;

9
scd/scdaemon.c
View File

@ -73,6 +73,8 @@ enum cmd_and_opt_values
opcscDriver, opcscDriver,
oDisableCCID, oDisableCCID,
oDisableOpenSC, oDisableOpenSC,
oAllowAdmin,
oDenyAdmin,
aTest }; aTest };
@ -112,8 +114,8 @@ static ARGPARSE_OPTS opts[] = {
"@" "@"
#endif #endif
/* end --disable-opensc */}, /* end --disable-opensc */},
{ oAllowAdmin, "allow-admin", 0, N_("allow the use of admin card commands")},
{ oDenyAdmin, "deny-admin", 0, "@" },
{0} {0}
}; };
@ -397,6 +399,9 @@ main (int argc, char **argv )
case oDisableCCID: opt.disable_ccid = 1; break; case oDisableCCID: opt.disable_ccid = 1; break;
case oDisableOpenSC: opt.disable_opensc = 1; break; case oDisableOpenSC: opt.disable_opensc = 1; break;
case oAllowAdmin: opt.allow_admin = 1; break;
case oDenyAdmin: opt.allow_admin = 0; break;
default : pargs.err = configfp? 1:2; break; default : pargs.err = configfp? 1:2; break;
} }
} }

2
scd/scdaemon.h
View File

@ -57,6 +57,8 @@ struct {
const char *pcsc_driver; /* Library to access the PC/SC system. */ const char *pcsc_driver; /* Library to access the PC/SC system. */
int disable_opensc; /* Disable the use of the OpenSC framework. */ int disable_opensc; /* Disable the use of the OpenSC framework. */
int disable_ccid; /* Disable the use of the internal CCID driver. */ int disable_ccid; /* Disable the use of the internal CCID driver. */
int allow_admin; /* Allow the use of admin commands for certain
cards. */
} opt; } opt;