Skip to content
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

Fail duplication operations if token does not support saveing state #209

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Fail duplication operations if token does not support saveing state #209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b4a5f7
Allow dupctx to fail for Digest operations
simo5 Feb 21, 2023
a56c6eb
Allow dupctx to fail for Signature operations
simo5 Feb 23, 2023
fce771b
Revert "Allow dupctx to fail for Signature operations"
simo5 Feb 23, 2023
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
30 changes: 12 additions & 18 deletions src/digests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,25 +178,18 @@ static void *p11prov_digest_dupctx(void *ctx)
/* This is not really funny. OpenSSL by default assumes contexts with
* operations in flight can be easily duplicated, with all the
* cryptographic status and then both context can keep going
* independently. We'll try to save/restore state here, but on failure
* we just 'move' the the session to the new context and hope there is no
* need for the old context which will have no session and just return
* errors if an update is attempted. */
* independently. We'll try to save/restore state here, but will rarely
* succeed */

sess = p11prov_session_handle(dctx->session);

/* move old session to new context, we swap because often openssl continues
* on the duplicated context by default */
newctx->session = dctx->session;
dctx->session = NULL;

/* NOTE: most tokens will probably return errors trying to do this on digest
* sessions */

ret = p11prov_GetOperationState(dctx->provctx, sess, NULL_PTR, &state_len);
if (ret != CKR_OK) {
goto done;
}

state = OPENSSL_malloc(state_len);
if (state == NULL) {
goto done;
Expand All @@ -208,22 +201,23 @@ static void *p11prov_digest_dupctx(void *ctx)
}

ret =
p11prov_get_session(dctx->provctx, &slotid, NULL, NULL, dctx->mechtype,
NULL, NULL, false, false, &dctx->session);
p11prov_get_session(newctx->provctx, &slotid, NULL, NULL,
newctx->mechtype, NULL, NULL, false, false,
&newctx->session);
if (ret != CKR_OK) {
P11PROV_raise(dctx->provctx, ret, "Failed to open new session");
goto done;
}
sess = p11prov_session_handle(dctx->session);
sess = p11prov_session_handle(newctx->session);

ret = p11prov_SetOperationState(dctx->provctx, sess, state, state_len,
ret = p11prov_SetOperationState(newctx->provctx, sess, state, state_len,
CK_INVALID_HANDLE, CK_INVALID_HANDLE);
if (ret != CKR_OK) {
p11prov_return_session(dctx->session);
dctx->session = NULL;
}

done:
if (ret != CKR_OK) {
p11prov_digest_freectx(newctx);
newctx = NULL;
}
OPENSSL_free(state);
return newctx;
}
Expand Down