Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions libckteec/include/pkcs11.h
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,9 @@ struct CK_ATTRIBUTE {
#define CKA_DEFAULT_CMS_ATTRIBUTES 0x0502
#define CKA_SUPPORTED_CMS_ATTRIBUTES 0x0503
#define CKA_ALLOWED_MECHANISMS (0x0600 | CKF_ARRAY_ATTRIBUTE)
/* Vendor Defined Indestructible Attribute */
#define CKA_OPTEE_INDESTRUCTIBLE (0x0001 | CKA_VENDOR_DEFINED)


/* Attribute CKA_CLASS refers to a CK_OBJECT_CLASS typed value */
typedef CK_ULONG CK_OBJECT_CLASS;
Expand Down
2 changes: 2 additions & 0 deletions libckteec/include/pkcs11_ta.h
Original file line number Diff line number Diff line change
Expand Up @@ -1139,6 +1139,8 @@ enum pkcs11_attr_id {
PKCS11_CKA_ALLOWED_MECHANISMS = 0x40000600,
/* Vendor extension: reserved for undefined ID (~0U) */
PKCS11_CKA_UNDEFINED_ID = PKCS11_UNDEFINED_ID,
/* Vendor Defined Indestructible Attribute */
PKCS11_CKA_OPTEE_INDESTRUCTIBLE = 0x80000001,
Comment on lines 1140 to +1143
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you intend with tabulation, and swap the 2 IDs:

Suggested change
/* Vendor extension: reserved for undefined ID (~0U) */
PKCS11_CKA_UNDEFINED_ID = PKCS11_UNDEFINED_ID,
/* Vendor Defined Indestructible Attribute */
PKCS11_CKA_OPTEE_INDESTRUCTIBLE = 0x80000001,
/* Vendor Defined Indestructible Attribute */
PKCS11_CKA_OPTEE_INDESTRUCTIBLE = 0x80000001,
/* Vendor extension: reserved for undefined ID (~0U) */
PKCS11_CKA_UNDEFINED_ID = PKCS11_UNDEFINED_ID,

};

/*
Expand Down