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

In login() the flag CKF_LOGIN_REQUIRED is now ignored. This makes the behaviour of login() more predictable. If parameter --login is specified on the command line, then C_Login() is always called.fixes #220 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@4875 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
andre 2010-11-18 14:56:26 +00:00
parent d1aa716bec
commit bcef13cfd2
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -908,9 +908,6 @@ static int login(CK_SESSION_HANDLE session, int login_type)
get_token_info(opt_slot, &info);
if (!(info.flags & CKF_LOGIN_REQUIRED))
return 0;
/* Identify which pin to enter */
if (login_type == CKU_SO)
@ -920,8 +917,7 @@ static int login(CK_SESSION_HANDLE session, int login_type)
else if (login_type == CKU_CONTEXT_SPECIFIC)
pin = opt_pin ? opt_pin : opt_puk;
if (!pin && (info.flags & CKF_LOGIN_REQUIRED)
&& !(info.flags & CKF_PROTECTED_AUTHENTICATION_PATH)) {
if (!pin && !(info.flags & CKF_PROTECTED_AUTHENTICATION_PATH)) {
printf("Logging in to \"%s\".\n", p11_utf8_to_local(info.label, sizeof(info.label)));
if (login_type == CKU_SO)
printf("Please enter SO PIN: ");