Tests: add space padding to label in InitToken

Signed-off-by: Zoltan Fridrich <zfridric@redhat.com>
p11-glue · Jun 8, 2023 · 90b7cf1 · 90b7cf1
1 parent 3e1307d
commit 90b7cf1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/common/mock.c b/common/mock.c
@@ -881,7 +881,7 @@ mock_C_InitToken__specific_args (CK_SLOT_ID slot_id,
 	if (strlen ("TEST PIN") != pin_len ||
 	    strncmp ((char *)pin, "TEST PIN", pin_len) != 0)
 		return CKR_PIN_INVALID;
-	if (strcmp ((char *)label, "TEST LABEL") != 0)
+	if (strncmp ((char *)label, "TEST LABEL                      ", 32) != 0)
 		return CKR_ARGUMENTS_BAD;
 
 	free (the_pin);

diff --git a/p11-kit/test-filter.c b/p11-kit/test-filter.c
@@ -138,10 +138,10 @@ test_allowed (void)
 	rv = (module->C_GetMechanismInfo) (slots[0], mechs[0], &mech);
 	assert_num_eq (CKR_OK, rv);
 
-	rv = (module->C_InitToken) (99, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (99, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert_num_eq (CKR_SLOT_ID_INVALID, rv);
 
-	rv = (module->C_InitToken) (slots[0], (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (slots[0], (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert_num_eq (CKR_OK, rv);
 
 	rv = (module->C_WaitForSlotEvent) (0, &slot, NULL);
@@ -269,10 +269,10 @@ test_write_protected (void)
 	rv = (module->C_GetMechanismInfo) (slots[0], mechs[0], &mech);
 	assert_num_eq (CKR_OK, rv);
 
-	rv = (module->C_InitToken) (99, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (99, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert_num_eq (CKR_SLOT_ID_INVALID, rv);
 
-	rv = (module->C_InitToken) (slots[0], (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (slots[0], (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert_num_eq (CKR_TOKEN_WRITE_PROTECTED, rv);
 
 	rv = (module->C_WaitForSlotEvent) (0, &slot, NULL);

diff --git a/p11-kit/test-mock.c b/p11-kit/test-mock.c
@@ -253,14 +253,14 @@ test_init_token (void)
 
 	module = setup_mock_module (NULL);
 
-	rv = (module->C_InitToken) (MOCK_SLOT_ONE_ID, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (MOCK_SLOT_ONE_ID, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert (rv == CKR_OK);
 
-	rv = (module->C_InitToken) (MOCK_SLOT_ONE_ID, (CK_UTF8CHAR_PTR)"OTHER", 5, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (MOCK_SLOT_ONE_ID, (CK_UTF8CHAR_PTR)"OTHER", 5, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert (rv == CKR_PIN_INVALID);
-	rv = (module->C_InitToken) (MOCK_SLOT_TWO_ID, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (MOCK_SLOT_TWO_ID, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert (rv == CKR_TOKEN_NOT_PRESENT);
-	rv = (module->C_InitToken) (0, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL");
+	rv = (module->C_InitToken) (0, (CK_UTF8CHAR_PTR)"TEST PIN", 8, (CK_UTF8CHAR_PTR)"TEST LABEL                      ");
 	assert (rv == CKR_SLOT_ID_INVALID);
 
 	teardown_mock_module (module);