Skip to content

wolfcrypt/src/wc_pkcs11.c: cache PKCS#11 session across multi-call HMAC #10335

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

Open
julek-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −3
Open

wolfcrypt/src/wc_pkcs11.c: cache PKCS#11 session across multi-call HMAC #10335

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
42 changes: 39 additions & 3 deletions wolfcrypt/src/wc_pkcs11.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6535,10 +6535,46 @@ int wc_Pkcs11_CryptoDevCb(int devId, wc_CryptoInfo* info, void* ctx)
}
else if (info->algo_type == WC_ALGO_TYPE_HMAC) {
#ifndef NO_HMAC
ret = Pkcs11OpenSession(token, &session, readWrite);
if (ret == 0) {
Hmac* hmac = info->hmac.hmac;

/* Sign ops are session-scoped; cache the session across
* multi-call HMAC dispatches. */
if (hmac != NULL && hmac->devCtx != NULL) {
session.func = token->func;
session.slotId = token->slotId;
session.version = token->version;
session.handle =
(CK_SESSION_HANDLE)(wc_ptr_t)hmac->devCtx;
ret = Pkcs11Hmac(&session, info);
Pkcs11CloseSession(token, &session);
if (ret != 0 ||
hmac->innerHashKeyed
!= WC_HMAC_INNER_HASH_KEYED_DEV) {
Pkcs11CloseSession(token, &session);
hmac->devCtx = NULL;
Comment thread
julek-wolfssl marked this conversation as resolved.
/* Don't leave stale DEV state past session close;
* leave SW state (owned by software fallback). */
if (hmac->innerHashKeyed
== WC_HMAC_INNER_HASH_KEYED_DEV)
hmac->innerHashKeyed = 0;
}
}
else {
ret = Pkcs11OpenSession(token, &session, readWrite);
if (ret == 0) {
ret = Pkcs11Hmac(&session, info);
if (ret == 0 && hmac != NULL &&
hmac->innerHashKeyed
== WC_HMAC_INNER_HASH_KEYED_DEV) {
hmac->devCtx =
(void*)(wc_ptr_t)session.handle;
}
else {
Comment thread
julek-wolfssl marked this conversation as resolved.
Pkcs11CloseSession(token, &session);
if (hmac != NULL && hmac->innerHashKeyed
== WC_HMAC_INNER_HASH_KEYED_DEV)
hmac->innerHashKeyed = 0;
}
}
}
#else
ret = NOT_COMPILED_IN;
Expand Down
Loading