diff options
| author | Daiki Ueno <dueno@redhat.com> | 2018-08-31 10:25:26 +0200 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2018-08-31 10:49:42 +0200 |
| commit | 7f1df14e041c6de9603a4720753ca8f31e32b4ff (patch) | |
| tree | a4110e48f42076203588955f7beed1e227be1ce5 /common | |
| parent | 3770793f026e46a000d2d8816d56122598289d5c (diff) | |
pkcs11: Don't redefine CKM_CAMELLIA_KEY_GEN
Also reorder the CKM_CAMELLIA_* definitions.
Diffstat (limited to 'common')
| -rw-r--r-- | common/pkcs11.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/common/pkcs11.h b/common/pkcs11.h index 9d31ce8..521c58d 100644 --- a/common/pkcs11.h +++ b/common/pkcs11.h @@ -750,8 +750,6 @@ typedef unsigned long ck_mechanism_type_t; #define CKM_KIP_DERIVE (0x510UL) #define CKM_KIP_WRAP (0x511UL) #define CKM_KIP_MAC (0x512UL) -#define CKM_CAMELLIA_KEY_GEN (0x550UL) -#define CKM_CAMELLIA_CTR (0x558UL) #define CKM_ARIA_KEY_GEN (0x560UL) #define CKM_ARIA_ECB (0x561UL) #define CKM_ARIA_CBC (0x562UL) @@ -877,6 +875,7 @@ typedef unsigned long ck_mechanism_type_t; #define CKM_CAMELLIA_CBC_PAD (0x555UL) #define CKM_CAMELLIA_ECB_ENCRYPT_DATA (0x556UL) #define CKM_CAMELLIA_CBC_ENCRYPT_DATA (0x557UL) +#define CKM_CAMELLIA_CTR (0x558UL) #define CKM_AES_KEY_WRAP (0x2109UL) #define CKM_AES_KEY_WRAP_PAD (0x210aUL) |