Ed25519 test cases by sa-kib · Pull Request #610 · OP-TEE/optee_test

sa-kib · 2022-08-15T09:28:20Z

Add test cases to generate ED25519 key, sign/verify for ED25519, ED25519ctx and ED25519ph.
Companion PR for Ed25519 OP-TEE implementation: #5486

jenswi-linaro · 2022-08-16T10:24:39Z

host/xtest/regression_4000_data.h

 	0x76, 0xf0, 0x9b, 0x3c, 0x1e, 0x16, 0x17, 0x42
 };

+


Please add a comment describing where you got these test vectors from.

done in 21de224

jenswi-linaro · 2022-08-16T10:26:12Z

host/xtest/regression_4000.c

+	TEEC_Session session = { };
+	TEE_OperationHandle op = TEE_HANDLE_NULL;
+	TEE_ObjectHandle key_handle = TEE_HANDLE_NULL;
+


Empty line not needed between the declarations of stack variables.

done in 4ad27fe

jenswi-linaro · 2022-08-16T10:26:40Z

host/xtest/regression_4000.c

+
+	if (!ADBG_EXPECT_TEEC_SUCCESS(c,
+			xtest_teec_open_session(&session, &crypt_user_ta_uuid,
+			    NULL, &ret_orig)))


Please align with the ( on the line above. Same below where possible.

done in 21de224

jenswi-linaro

With my comment addressed:
Acked-by: Jens Wiklander <jens.wiklander@linaro.org>

jenswi-linaro · 2022-08-31T06:03:14Z

host/xtest/regression_4000.c

+						tv->ptx_len, out, &out_size)))
+				goto out;
+
+			ADBG_EXPECT_COMPARE_UNSIGNED(c,


Please use ADBG_EXPECT_BUFFER() instead.

The test vectors originate from RFC 8032 sections 7.1, 7.2, 7.3 This patch is not expected to be merged. The pull request will be rebased as soon as the pull request with these data vectors is merged: OP-TEE#610 Signed-off-by: Valerii Chubar <valerii_chubar@epam.com>

etienne-lms

There are minor indentation issues.
Acked-by: Etienne Carriere <etienne.carriere@linaro.org> once addressed.

etienne-lms · 2022-09-30T08:12:49Z

host/xtest/regression_4000.c

+		const uint8_t flag;
+		const uint8_t *context;
+		size_t context_len;
+	} eddsa;


fix indentation

etienne-lms · 2022-09-30T08:14:04Z

host/xtest/regression_4000.c

+	TEEC_CloseSession(&session);
+}
+ADBG_CASE_DEFINE(regression, 4016_ed25519, xtest_tee_test_4016_ed25519,
+"Test TEE Internal API ED25519 sign/verify");


fix indenation

ADBG_CASE_DEFINE(regression, 4016_ed25519, xtest_tee_test_4016_ed25519, -"Test TEE Internal API ED25519 sign/verify"); + "Test TEE Internal API ED25519 sign/verify");

etienne-lms · 2022-09-30T08:15:09Z

host/xtest/regression_4000.c

+			xtest_add_attr(&num_attrs, attrs,
+				       TEE_ATTR_EDDSA_PREHASH, NULL, 0);
+
+


remove one of the 2 empty lines

jforissier · 2022-10-03T14:53:11Z

There is a problem with the key generation test

  2067:  * regression_4007_ed25519 Test TEE Internal API Generate ed25519 key
  2068:  o regression_4007_ed25519.1 Generate Ed25519 key
  2069:  regression_4000.c:4350: ta_crypt_cmd_generate_key(c, s, key, key_size, params, param_count) has an unexpected value: 0xffff0006 = TEEC_ERROR_BAD_PARAMETERS, expected 0x0 = TEEC_SUCCESS
  2070:  regression_4000.c:4835: generate_and_test_key(c, &session, 0xA1000043, 0, 256, ((void *)0), 0) has an unexpected value: 0x0 = false, expected 0x1 = true
  2071:    regression_4007_ed25519.1 FAILED
  2072:    regression_4007_ed25519 FAILED

The test vectors originate from RFC 8032 sections 7.1, 7.2, 7.3 This patch is not expected to be merged. The pull request will be rebased as soon as the pull request with these data vectors is merged: OP-TEE#610 Signed-off-by: Valerii Chubar <valerii_chubar@epam.com>

etienne-lms · 2022-10-04T12:45:00Z

host/xtest/regression_4000.c

+			generate_and_test_key(c, &session,
+					      TEE_TYPE_ED25519_KEYPAIR, 0, 256,
+					      NULL, 0)))
+		return;


shouold remove instruction return here:

Do_ADBG_BeginSubCase(c, "Generate Ed25519 key"); ADBG_EXPECT_TRUE(c, generate_and_test_key(c, &session, TEE_TYPE_ED25519_KEYPAIR, 0, 256, NULL, 0)); Do_ADBG_EndSubCase(c, "Generate Ed25519 key"); out: TEEC_CloseSession(&session);

done, thank you!

jforissier · 2022-10-05T15:51:25Z

There is a problem with the key generation test

  2067:  * regression_4007_ed25519 Test TEE Internal API Generate ed25519 key
  2068:  o regression_4007_ed25519.1 Generate Ed25519 key
  2069:  regression_4000.c:4350: ta_crypt_cmd_generate_key(c, s, key, key_size, params, param_count) has an unexpected value: 0xffff0006 = TEEC_ERROR_BAD_PARAMETERS, expected 0x0 = TEEC_SUCCESS
  2070:  regression_4000.c:4835: generate_and_test_key(c, &session, 0xA1000043, 0, 256, ((void *)0), 0) has an unexpected value: 0x0 = false, expected 0x1 = true
  2071:    regression_4007_ed25519.1 FAILED
  2072:    regression_4007_ed25519 FAILED

OP-TEE/optee_os#5569

jforissier · 2022-10-06T16:11:13Z

Yet another problem with the key generation test, this time hopefully fixed by OP-TEE/optee_os#5573.

jforissier · 2022-10-06T16:13:56Z

@sa-kib would you mind addressing @etienne-lms's comments and applying his Acked-by? Thanks!

Add test cases to generate ED25519 key, sign/verify for ED25519, ED25519ctx and ED25519ph. The test vectors originate from RFC 8032 sections 7.1, 7.2, 7.3 Signed-off-by: Valerii Chubar <valerii_chubar@epam.com> Signed-off-by: Sergiy Kibrik <Sergiy_Kibrik@epam.com> Acked-by: Jens Wiklander <jens.wiklander@linaro.org> Acked-by: Etienne Carriere <etienne.carriere@linaro.org>

sa-kib · 2022-10-07T11:05:47Z

@sa-kib would you mind addressing @etienne-lms's comments and applying his Acked-by? Thanks!

patch is updated now, thank you!

jforissier · 2022-10-11T21:29:50Z

CI is now happy, thanks all.

sa-kib mentioned this pull request Aug 15, 2022

support Ed25519 sign/verify scheme OP-TEE/optee_os#5486

Merged

jenswi-linaro reviewed Aug 16, 2022

View reviewed changes

sa-kib changed the title ~~[RFC] ED25519 test cases~~ ED25519 test cases Aug 29, 2022

sa-kib changed the title ~~ED25519 test cases~~ Ed25519 test cases Aug 29, 2022

jenswi-linaro reviewed Aug 31, 2022

View reviewed changes

sa-kib force-pushed the ed25519_tests branch from 4ad27fe to aa59a7c Compare August 31, 2022 10:06

sa-kib force-pushed the ed25519_tests branch from aa59a7c to 0f413cd Compare September 12, 2022 13:08

varder mentioned this pull request Sep 29, 2022

PKCS#11 Ed25519 tests #618

Merged

etienne-lms suggested changes Sep 30, 2022

View reviewed changes

etienne-lms reviewed Oct 4, 2022

View reviewed changes

sa-kib force-pushed the ed25519_tests branch from 0f413cd to d05d143 Compare October 7, 2022 11:01

varder mentioned this pull request Oct 7, 2022

ta: pkcs11: Fix key generation for Ed25519 OP-TEE/optee_os#5574

Merged

jforissier merged commit ab9863c into OP-TEE:master Oct 11, 2022

sa-kib deleted the ed25519_tests branch October 12, 2022 09:40

		xtest_add_attr(&num_attrs, attrs,
		TEE_ATTR_EDDSA_PREHASH, NULL, 0);

Conversation

sa-kib commented Aug 15, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

sa-kib Aug 29, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jenswi-linaro left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

etienne-lms left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jforissier commented Oct 3, 2022

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jforissier commented Oct 5, 2022

Uh oh!

jforissier commented Oct 6, 2022

Uh oh!

jforissier commented Oct 6, 2022

Uh oh!

sa-kib commented Oct 7, 2022

Uh oh!

jforissier commented Oct 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

sa-kib Aug 29, 2022 •

edited

Loading