GithubStar/open62541
1
0
Fork 0
mirror of https://github.com/open62541/open62541.git synced 2026-10-16 20:33:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(pubsub): validate TPM key handles and nonce

Browse Source 
Require serialized PKCS#11 handles and the specified four-byte key nonce before copying key material into the TPM channel context. This rejects incompatible raw SKS keys and prevents out-of-bounds reads from undersized inputs.
This commit is contained in:
Julius Pfrommer
2026-09-17 21:07:05 +02:00
committed by Julius Pfrommer
parent 25aa35db42
commit f782a38cb6
2 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/crypto/pkcs11/securitypolicy_pubsub_aes128ctr_tpm.c
+25 -6
View File
@@ -263,6 +263,13 @@ channelContext_newContext_sp_pubsub_aes128ctr_tpm(void *policyContext,
const UA_ByteString *keyNonce,
void **wgContext) {
if(!signingKey || !encryptingKey || !keyNonce || !wgContext ||
keyNonce->length != UA_AES128CTR_KEYNONCE_LENGTH ||
((signingKey->length != 0 || encryptingKey->length != 0) &&
(signingKey->length != sizeof(unsigned long) ||
encryptingKey->length != sizeof(unsigned long))))
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
/* Allocate the channel context */
PUBSUB_AES128CTR_ChannelContext *cc = (PUBSUB_AES128CTR_ChannelContext *)
UA_calloc(1, sizeof(PUBSUB_AES128CTR_ChannelContext));
@@ -296,11 +303,14 @@ channelContext_newContext_sp_pubsub_aes128ctr_tpm(void *policyContext,
return rv;
}
} else {
memcpy(&cc->encryptingKeyHandle, encryptingKey->data, sizeof(encryptingKey));
memcpy(&cc->signingKeyHandle, signingKey->data, sizeof(signingKey));
memcpy(&cc->encryptingKeyHandle, encryptingKey->data,
sizeof(cc->encryptingKeyHandle));
memcpy(&cc->signingKeyHandle, signingKey->data,
sizeof(cc->signingKeyHandle));
}
memcpy(&cc->keyNonceHandle, keyNonce->data, keyNonce->length);
memcpy(&cc->keyNonceHandle, keyNonce->data,
UA_AES128CTR_KEYNONCE_LENGTH);
*wgContext = cc;
@@ -553,9 +563,18 @@ channelContext_setKeys_sp_pubsub_aes128ctr_tpm(PUBSUB_AES128CTR_ChannelContext *
const UA_ByteString *encryptingKey,
const UA_ByteString *keyNonce) {
memcpy(&cc->encryptingKeyHandle, encryptingKey->data, sizeof(encryptingKey));
memcpy(&cc->signingKeyHandle, signingKey->data, sizeof(signingKey));
memcpy(&cc->keyNonceHandle, keyNonce->data, sizeof(keyNonce));
if(!cc || !signingKey || !encryptingKey || !keyNonce ||
signingKey->length != sizeof(cc->signingKeyHandle) ||
encryptingKey->length != sizeof(cc->encryptingKeyHandle) ||
keyNonce->length != UA_AES128CTR_KEYNONCE_LENGTH)
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
memcpy(&cc->encryptingKeyHandle, encryptingKey->data,
sizeof(cc->encryptingKeyHandle));
memcpy(&cc->signingKeyHandle, signingKey->data,
sizeof(cc->signingKeyHandle));
memcpy(&cc->keyNonceHandle, keyNonce->data,
UA_AES128CTR_KEYNONCE_LENGTH);
return UA_STATUSCODE_GOOD;
}
plugins/crypto/pkcs11/securitypolicy_pubsub_aes256ctr_tpm.c
+25 -6
View File
@@ -263,6 +263,13 @@ channelContext_newContext_sp_pubsub_aes256ctr_tpm(void *policyContext,
const UA_ByteString *keyNonce,
void **wgContext) {
if(!signingKey || !encryptingKey || !keyNonce || !wgContext ||
keyNonce->length != UA_AES256CTR_KEYNONCE_LENGTH ||
((signingKey->length != 0 || encryptingKey->length != 0) &&
(signingKey->length != sizeof(unsigned long) ||
encryptingKey->length != sizeof(unsigned long))))
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
/* Allocate the channel context */
PUBSUB_AES256CTR_ChannelContext *cc = (PUBSUB_AES256CTR_ChannelContext *)
UA_calloc(1, sizeof(PUBSUB_AES256CTR_ChannelContext));
@@ -302,11 +309,14 @@ channelContext_newContext_sp_pubsub_aes256ctr_tpm(void *policyContext,
return rv;
}
} else {
memcpy(&cc->encryptingKeyHandle, encryptingKey->data, sizeof(encryptingKey));
memcpy(&cc->signingKeyHandle, signingKey->data, sizeof(signingKey));
memcpy(&cc->encryptingKeyHandle, encryptingKey->data,
sizeof(cc->encryptingKeyHandle));
memcpy(&cc->signingKeyHandle, signingKey->data,
sizeof(cc->signingKeyHandle));
}
memcpy(&cc->keyNonceHandle, keyNonce->data, keyNonce->length);
memcpy(&cc->keyNonceHandle, keyNonce->data,
UA_AES256CTR_KEYNONCE_LENGTH);
*wgContext = cc;
@@ -559,9 +569,18 @@ channelContext_setKeys_sp_pubsub_aes256ctr_tpm(PUBSUB_AES256CTR_ChannelContext *
const UA_ByteString *encryptingKey,
const UA_ByteString *keyNonce) {
memcpy(&cc->encryptingKeyHandle, encryptingKey->data, sizeof(encryptingKey));
memcpy(&cc->signingKeyHandle, signingKey->data, sizeof(signingKey));
memcpy(&cc->keyNonceHandle, keyNonce->data, sizeof(keyNonce));
if(!cc || !signingKey || !encryptingKey || !keyNonce ||
signingKey->length != sizeof(cc->signingKeyHandle) ||
encryptingKey->length != sizeof(cc->encryptingKeyHandle) ||
keyNonce->length != UA_AES256CTR_KEYNONCE_LENGTH)
return UA_STATUSCODE_BADSECURITYCHECKSFAILED;
memcpy(&cc->encryptingKeyHandle, encryptingKey->data,
sizeof(cc->encryptingKeyHandle));
memcpy(&cc->signingKeyHandle, signingKey->data,
sizeof(cc->signingKeyHandle));
memcpy(&cc->keyNonceHandle, keyNonce->data,
UA_AES256CTR_KEYNONCE_LENGTH);
return UA_STATUSCODE_GOOD;
}