Skip to content

Use PIN from refresh URI when taking login session #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Use PIN from refresh URI when taking login session #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions src/objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,8 @@ static void destroy_key_cache(P11PROV_OBJ *obj, P11PROV_SESSION *session)
if (session) {
sess = p11prov_session_handle(session);
} else {
ret = p11prov_take_login_session(obj->ctx, obj->slotid, &_session);
ret = p11prov_take_login_session(obj->ctx, obj->slotid,
obj->refresh_uri, &_session);
if (ret != CKR_OK) {
P11PROV_debug("Failed to get login session. Error %lx", ret);
return;
Expand Down Expand Up @@ -369,7 +370,8 @@ static void cache_key(P11PROV_OBJ *obj)
return;
}

ret = p11prov_take_login_session(obj->ctx, obj->slotid, &session);
ret = p11prov_take_login_session(obj->ctx, obj->slotid, obj->refresh_uri,
&session);
if (ret != CKR_OK || session == NULL) {
P11PROV_debug("Failed to get login session. Error %lx", ret);
return;
Expand Down Expand Up @@ -3601,7 +3603,7 @@ static CK_RV p11prov_store_rsa_public_key(P11PROV_OBJ *key)
goto done;
}

rv = p11prov_take_login_session(key->ctx, slot, &session);
rv = p11prov_take_login_session(key->ctx, slot, key->refresh_uri, &session);
if (rv != CKR_OK) {
goto done;
}
Expand Down Expand Up @@ -3670,7 +3672,7 @@ static CK_RV p11prov_store_ec_public_key(P11PROV_OBJ *key)
goto done;
}

rv = p11prov_take_login_session(key->ctx, slot, &session);
rv = p11prov_take_login_session(key->ctx, slot, key->refresh_uri, &session);
if (rv != CKR_OK) {
goto done;
}
Expand Down Expand Up @@ -3858,7 +3860,7 @@ static CK_RV p11prov_store_rsa_private_key(P11PROV_OBJ *key,
goto done;
}

rv = p11prov_take_login_session(key->ctx, slot, &session);
rv = p11prov_take_login_session(key->ctx, slot, key->refresh_uri, &session);
if (rv != CKR_OK) {
goto done;
}
Expand Down Expand Up @@ -3954,7 +3956,7 @@ static CK_RV p11prov_store_ec_private_key(P11PROV_OBJ *key,
goto done;
}

rv = p11prov_take_login_session(key->ctx, slot, &session);
rv = p11prov_take_login_session(key->ctx, slot, key->refresh_uri, &session);
if (rv != CKR_OK) {
goto done;
}
Expand Down
4 changes: 2 additions & 2 deletions src/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1045,7 +1045,7 @@ CK_RV p11prov_get_session(P11PROV_CTX *provctx, CK_SLOT_ID *slotid,
}

CK_RV p11prov_take_login_session(P11PROV_CTX *provctx, CK_SLOT_ID slotid,
P11PROV_SESSION **_session)
P11PROV_URI *uri, P11PROV_SESSION **_session)
{
P11PROV_SLOTS_CTX *slots = NULL;
P11PROV_SLOT *slot = NULL;
Expand All @@ -1071,7 +1071,7 @@ CK_RV p11prov_take_login_session(P11PROV_CTX *provctx, CK_SLOT_ID slotid,
goto done;
}

ret = slot_login(slot, NULL, NULL, NULL, false, _session);
ret = slot_login(slot, uri, NULL, NULL, false, _session);

done:
p11prov_return_slots(slots);
Expand Down
2 changes: 1 addition & 1 deletion src/session.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ CK_RV p11prov_get_session(P11PROV_CTX *provctx, CK_SLOT_ID *slotid,
OSSL_PASSPHRASE_CALLBACK *pw_cb, void *pw_cbarg,
bool reqlogin, bool rw, P11PROV_SESSION **session);
CK_RV p11prov_take_login_session(P11PROV_CTX *provctx, CK_SLOT_ID slotid,
P11PROV_SESSION **_session);
P11PROV_URI *uri, P11PROV_SESSION **_session);
void p11prov_return_session(P11PROV_SESSION *session);

CK_RV p11prov_context_specific_login(P11PROV_SESSION *session, P11PROV_URI *uri,
Expand Down
Loading