fixup! libckteec: Add EDDSA attribute serialization

Signed-off-by: Valerii Chubar <[email protected]>
OP-TEE · Oct 3, 2022 · aba80ff · aba80ff
1 parent 04089e3
commit aba80ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/libckteec/include/pkcs11.h b/libckteec/include/pkcs11.h
@@ -230,7 +230,6 @@ 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
 #define CKK_GENERIC_SECRET		0x010
 #define CKK_DES3			0x015
 #define CKK_AES				0x01f
@@ -241,6 +240,7 @@ typedef CK_KEY_TYPE *CK_KEY_TYPE_PTR;
 #define CKK_SHA384_HMAC			0x02c
 #define CKK_SHA512_HMAC			0x02d
 #define CKK_SHA224_HMAC			0x02e
+#define CKK_EC_EDWARDS			0x040 /* PKCS#11 v3.1-cs01 */
 
 /*
  * Certificates
@@ -340,7 +340,6 @@ typedef CK_MECHANISM_TYPE *CK_MECHANISM_TYPE_PTR;
 #define CKM_SHA384_KEY_DERIVATION	0x00394
 #define CKM_SHA512_KEY_DERIVATION	0x00395
 #define CKM_SHA224_KEY_DERIVATION	0x00396
-#define CKM_EC_EDWARDS_KEY_PAIR_GEN	0x01055
 #define CKM_EC_KEY_PAIR_GEN		0x01040
 #define CKM_ECDSA			0x01041
 #define CKM_ECDSA_SHA1			0x01042
@@ -352,8 +351,9 @@ 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
 #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
 #define CKM_AES_CBC			0x01082
@@ -495,7 +495,7 @@ struct CK_GCM_PARAMS {
 	CK_ULONG		ulTagBits;
 };
 
-/* EDDSA */
+/* EdDSA (RFC 8032) */
 typedef struct CK_EDDSA_PARAMS {
 	CK_BYTE phFlag;
 	CK_ULONG ulContextDataLen;

diff --git a/libckteec/include/pkcs11_ta.h b/libckteec/include/pkcs11_ta.h
@@ -1276,10 +1276,10 @@ enum pkcs11_mechanism_id {
 	PKCS11_CKM_ECDSA_SHA512			= 0x01046,
 	PKCS11_CKM_ECDH1_DERIVE			= 0x01050,
 	PKCS11_CKM_ECDH1_COFACTOR_DERIVE	= 0x01051,
-	PKCS11_CKM_EDDSA			= 0x01057,
 	PKCS11_CKM_ECMQV_DERIVE			= 0x01052,
 	PKCS11_CKM_ECDH_AES_KEY_WRAP		= 0x01053,
 	PKCS11_CKM_RSA_AES_KEY_WRAP		= 0x01054,
+	PKCS11_CKM_EDDSA				= 0x01057,
 	PKCS11_CKM_AES_KEY_GEN			= 0x01080,
 	PKCS11_CKM_AES_ECB			= 0x01081,
 	PKCS11_CKM_AES_CBC			= 0x01082,