Skip to content

Commit 80f0133

Browse files
authored
Merge pull request #316 from wolfSSL/Key-export-leak
Fix metadata label leak in WH_KEY_EXPORT error response
2 parents 81f22d6 + 70d63c2 commit 80f0133

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/wh_server_keystore.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1848,7 +1848,7 @@ int wh_Server_HandleKeyRequest(whServerContext* server, uint16_t magic,
18481848

18491849
case WH_KEY_EXPORT: {
18501850
whMessageKeystore_ExportRequest req;
1851-
whMessageKeystore_ExportResponse resp;
1851+
whMessageKeystore_ExportResponse resp = {0};
18521852
uint32_t keySz;
18531853

18541854
/* translate request */
@@ -1872,8 +1872,8 @@ int wh_Server_HandleKeyRequest(whServerContext* server, uint16_t magic,
18721872
/* Only provide key output if no error */
18731873
if (ret == WH_ERROR_OK) {
18741874
resp.len = keySz;
1875+
memcpy(resp.label, meta->label, sizeof(meta->label));
18751876
}
1876-
memcpy(resp.label, meta->label, sizeof(meta->label));
18771877

18781878
(void)WH_SERVER_NVM_UNLOCK(server);
18791879
} /* WH_SERVER_NVM_LOCK() */

0 commit comments

Comments
 (0)