Skip to content

spelling fix and demo test case fix #330

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

Merged
billphipps merged 3 commits into from
Apr 8, 2026
Merged

spelling fix and demo test case fix #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d042f80
spelling fix
JacobBarthelmeh Apr 7, 2026
46587b6
use an actual hash digest with demo ecc sign/verify
JacobBarthelmeh Apr 7, 2026
325d76d
check for sig oid error along with sig confirm error
JacobBarthelmeh Apr 8, 2026
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
4 changes: 2 additions & 2 deletions docs/src/chapter07.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,14 +248,14 @@ The data payload is a fixed size data buffer that the client can use in any way
```c
/* request message to the custom server callback */
typedef struct {
uint32_t id; /* indentifier of registered callback */
uint32_t id; /* identifier of registered callback */
uint32_t type; /* whMessageCustomCb_Type */
whMessageCustomCb_Data data;
} whMessageCustomCb_Request;

/* response message from the custom server callback */
typedef struct {
uint32_t id; /* indentifier of registered callback */
uint32_t id; /* identifier of registered callback */
uint32_t type; /* whMessageCustomCb_Type */
int32_t rc; /* Return code from custom callback. Invalid if err != 0 */
int32_t err; /* wolfHSM-specific error. If err != 0, rc is invalid */
Expand Down
28 changes: 16 additions & 12 deletions examples/demo/client/wh_demo_client_crypto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,14 +494,16 @@ int wh_DemoClient_CryptoEcc(whClientContext* clientContext)
WC_RNG rng[1];
byte sharedOne[32];
byte sharedTwo[32];
const char plainMessage[16] = "message example";
byte message[sizeof(plainMessage)];
/* Pre-computed SHA-256 digest of "message example" */
/* Canned SHA-256 digest to use for sign/verify demo */
byte message[32] = {
0x48, 0x0E, 0x66, 0x2E, 0x59, 0x0A, 0x79, 0x6E,
0xE5, 0x00, 0xE1, 0xA0, 0xB7, 0xE1, 0x2C, 0x4E,
0xD0, 0x39, 0x1D, 0x67, 0x56, 0x2F, 0x6E, 0xE0,
0x48, 0x9C, 0x00, 0xB9, 0xA9, 0x37, 0x21, 0x00
};
byte signature[128];

/* Set the message to the test string */
strncpy((char*)message, plainMessage, sizeof(message)-1);
message[sizeof(message)-1] = '\0';

/* Initialize the rng to make the ecc keys */
ret = wc_InitRng_ex(rng, NULL, WH_DEV_ID);
if (ret != 0) {
Expand Down Expand Up @@ -624,15 +626,17 @@ int wh_DemoClient_CryptoEccImport(whClientContext* clientContext)
WC_RNG rng[1];
byte sharedOne[32];
byte sharedTwo[32];
const char plainMessage[16] = "message example";
byte message[sizeof(plainMessage)];
/* Pre-computed SHA-256 digest of "message example" */
/* Canned SHA-256 digest to use for sign/verify demo */
byte message[32] = {
0x48, 0x0E, 0x66, 0x2E, 0x59, 0x0A, 0x79, 0x6E,
0xE5, 0x00, 0xE1, 0xA0, 0xB7, 0xE1, 0x2C, 0x4E,
0xD0, 0x39, 0x1D, 0x67, 0x56, 0x2F, 0x6E, 0xE0,
0x48, 0x9C, 0x00, 0xB9, 0xA9, 0x37, 0x21, 0x00
};
byte signature[128];
uint8_t keyBuf[256];

/* Set the message to the test string */
strncpy((char*)message, plainMessage, sizeof(message)-1);
message[sizeof(message)-1] = '\0';

/* Initialize the rng for signature signing */
ret = wc_InitRng_ex(rng, NULL, WH_DEV_ID);
if (ret != 0) {
Expand Down
8 changes: 4 additions & 4 deletions src/wh_server_cert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -746,10 +746,10 @@ int wh_Server_HandleCertRequest(whServerContext* server, uint16_t magic,
(void)WH_SERVER_NVM_UNLOCK(server);
} /* WH_SERVER_NVM_LOCK() */

/* Signature confirmation error is not an error for the server, so
/* Signature verification error is not an error for the server, so
* propagate this error to the client in the response, otherwise
* return the error code from the verify action */
if (rc == ASN_SIG_CONFIRM_E) {
if (rc == ASN_SIG_CONFIRM_E || rc == ASN_SIG_OID_E) {
resp.rc = WH_ERROR_CERT_VERIFY;
rc = WH_ERROR_OK;
}
Expand Down Expand Up @@ -794,10 +794,10 @@ int wh_Server_HandleCertRequest(whServerContext* server, uint16_t magic,
(void)WH_SERVER_NVM_UNLOCK(server);
} /* WH_SERVER_NVM_LOCK() */

/* Signature confirmation error is not an error for the server,
/* Signature verification error is not an error for the server,
* so propagate this error to the client in the response,
* otherwise return the error code from the verify action */
if (rc == ASN_SIG_CONFIRM_E) {
if (rc == ASN_SIG_CONFIRM_E || rc == ASN_SIG_OID_E) {
resp.rc = WH_ERROR_CERT_VERIFY;
rc = WH_ERROR_OK;
}
Expand Down
Loading