giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Do not try to C_Login if the token doesn't require a login 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@1127 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
okir 2003-05-15 15:28:35 +00:00
parent 0f29e7543e
commit 2e673aead6
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/pkcs11-tool.c
View File

@ -346,15 +346,18 @@ main(int argc, char * const argv[])
/* Identify which pin to enter */
if (info.flags & CKF_PROTECTED_AUTHENTICATION_PATH)
if (info.flags & CKF_PROTECTED_AUTHENTICATION_PATH) {
pin = NULL;
else {
} else
if (info.flags & CKF_LOGIN_REQUIRED) {
if (opt_pin == NULL)
pin = getpass("Please enter PIN: ");
else
pin = opt_pin;
if (!pin || !*pin)
return 1;
} else {
goto skip_login;
}
rv = p11->C_Login(session, CKU_USER, (CK_UTF8CHAR *) pin,
pin == NULL ? 0 : strlen(pin));
@ -362,6 +365,7 @@ main(int argc, char * const argv[])
p11_fatal("C_Login", rv);
}
skip_login:
if (do_sign) {
if (!find_object(session, CKO_PRIVATE_KEY, &object, NULL, 0, 0))
fatal("Private key not found");