libckteec: Add EDDSA attribute serialization #324
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
etienne-lms
reviewed
Sep 30, 2022
libckteec/include/pkcs11.h
Outdated
| @@ -492,6 +495,15 @@ struct CK_GCM_PARAMS { | |||
| CK_ULONG ulTagBits; | |||
| }; | |||
|
|
|||
| /* EDDSA */ | |||
There was a problem hiding this comment.
Suggestion: /* EdDSA (RFC 8032) */ as that's the reference we find in the litterature?
libckteec/include/pkcs11.h
Outdated
| @@ -230,6 +230,7 @@ typedef CK_KEY_TYPE *CK_KEY_TYPE_PTR; | |||
| #define CKK_DH 0x002 | |||
| #define CKK_ECDSA 0x003 | |||
| #define CKK_EC 0x003 | |||
| #define CKK_EC_EDWARDS 0x040 | |||
There was a problem hiding this comment.
to move at the end (numerical order)
I propose you mention that this is from pkcs11 v3.1-cs01:
`#define CKK_EC_EDWARDS 0x040 /* from PKCS#11 v3.1-cs01 */
libckteec/include/pkcs11.h
Outdated
| @@ -350,6 +352,7 @@ typedef CK_MECHANISM_TYPE *CK_MECHANISM_TYPE_PTR; | |||
| #define CKM_ECDH1_COFACTOR_DERIVE 0x01051 | |||
| #define CKM_ECMQV_DERIVE 0x01052 | |||
| #define CKM_ECDH_AES_KEY_WRAP 0x01053 | |||
| #define CKM_EDDSA 0x01057 | |||
There was a problem hiding this comment.
#define CKM_ECMQV_DERIVE 0x01052
#define CKM_ECDH_AES_KEY_WRAP 0x01053
#define CKM_RSA_AES_KEY_WRAP 0x01054
+#define CKM_EC_EDWARDS_KEY_PAIR_GEN 0x01055
+#define CKM_EDDSA 0x01057
#define CKM_AES_KEY_GEN 0x01080
#define CKM_AES_ECB 0x01081
libckteec/include/pkcs11_ta.h
Outdated
| @@ -1276,6 +1276,7 @@ enum pkcs11_mechanism_id { | |||
| PKCS11_CKM_ECDSA_SHA512 = 0x01046, | |||
| PKCS11_CKM_ECDH1_DERIVE = 0x01050, | |||
| PKCS11_CKM_ECDH1_COFACTOR_DERIVE = 0x01051, | |||
| PKCS11_CKM_EDDSA = 0x01057, | |||
varder
force-pushed
the
eddsa
branch
2 times, most recently
from
aba80ff to
be84913
Compare
etienne-lms
reviewed
Oct 4, 2022
There was a problem hiding this comment.
Reviewed-by: Etienne Carriere <[email protected]> with 2 minor comments addressed.
libckteec/include/pkcs11.h
Outdated
| @@ -351,6 +352,8 @@ typedef CK_MECHANISM_TYPE *CK_MECHANISM_TYPE_PTR; | |||
| #define CKM_ECMQV_DERIVE 0x01052 | |||
| #define CKM_ECDH_AES_KEY_WRAP 0x01053 | |||
| #define CKM_RSA_AES_KEY_WRAP 0x01054 | |||
| #define CKM_EC_EDWARDS_KEY_PAIR_GEN 0x01055 | |||
| #define CKM_EDDSA 0x01057 | |||
There was a problem hiding this comment.
nitpicking: remove 1 or 2 tabulations
libckteec/include/pkcs11_ta.h
Outdated
| @@ -1279,6 +1279,7 @@ enum pkcs11_mechanism_id { | |||
| PKCS11_CKM_ECMQV_DERIVE = 0x01052, | |||
| PKCS11_CKM_ECDH_AES_KEY_WRAP = 0x01053, | |||
| PKCS11_CKM_RSA_AES_KEY_WRAP = 0x01054, | |||
| PKCS11_CKM_EDDSA = 0x01057, | |||
The PKCS#11 Specification: https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/cs01/ pkcs11-spec-v3.1-cs01.pdf 6.3.16 EC mechanism parameters Signed-off-by: Valerii Chubar <[email protected]> Reviewed-by: Etienne Carriere <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PKCS#11 Specification:
https://docs.oasis-open.org/pkcs11/pkcs11-spec/v3.1/cs01/pkcs11-spec-v3.1-cs01.pdf
The pull request should be merged with the following pull requests:
OP-TEE/optee_os#5559
OP-TEE/optee_test#618