james/yubikey.rs
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix test cases: uninitialized memory and non-terminated string compare

Browse Source
This commit is contained in:
Trevor Bentley
2017-06-29 14:27:36 +02:00
parent d5283fffae
commit ba7d256ecf
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ykcs11/tests/ykcs11_tests.c
+1 -1
View File
@@ -138,7 +138,7 @@ static void test_token_info() {
if (info.firmwareVersion.major != 4 && info.firmwareVersion.major != 0) if (info.firmwareVersion.major != 4 && info.firmwareVersion.major != 0)
asrt(info.firmwareVersion.major, 4, "FW_MAJ"); asrt(info.firmwareVersion.major, 4, "FW_MAJ");
asrt(strcmp(info.utcTime, TOKEN_TIME), 0, "TOKEN_TIME"); asrt(strncmp(info.utcTime, TOKEN_TIME, sizeof(info.utcTime)), 0, "TOKEN_TIME");
asrt(funcs->C_Finalize(NULL), CKR_OK, "FINALIZE"); asrt(funcs->C_Finalize(NULL), CKR_OK, "FINALIZE");
ykcs11/utils.c
+1
View File
@@ -182,6 +182,7 @@ CK_RV create_token(ykpiv_state *state, CK_BYTE_PTR p, ykcs11_slot_t *slot) {
t_info->ulFreePrivateMemory = CK_UNAVAILABLE_INFORMATION; t_info->ulFreePrivateMemory = CK_UNAVAILABLE_INFORMATION;
memset(&t_info->hardwareVersion, 0, sizeof(t_info->hardwareVersion));
// Ignore hardware version, report firmware version // Ignore hardware version, report firmware version
if (token.get_token_version(state, &t_info->firmwareVersion) != CKR_OK) { if (token.get_token_version(state, &t_info->firmwareVersion) != CKR_OK) {
ykpiv_disconnect(state); ykpiv_disconnect(state);