From 73124d51cd9708c5fd9afb23ab14e56d7a3fb470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20J=C3=A4=C3=A4skel=C3=A4inen?= Date: Sun, 18 Jul 2021 14:55:18 +0300 Subject: [PATCH] ta: pkcs11: Sort PKCS11_CKR_ helper lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sort PKCS11_CKR_ helper lines to match their order in pkcs11_ta.h. Signed-off-by: Vesa Jääskeläinen Reviewed-by: Etienne Carriere Reviewed-by: Jerome Forissier --- ta/pkcs11/src/pkcs11_helpers.c | 66 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/ta/pkcs11/src/pkcs11_helpers.c b/ta/pkcs11/src/pkcs11_helpers.c index 9f2256520b7..22e79613eff 100644 --- a/ta/pkcs11/src/pkcs11_helpers.c +++ b/ta/pkcs11/src/pkcs11_helpers.c @@ -236,59 +236,55 @@ static const struct any_id __maybe_unused string_session_state[] = { static const struct any_id __maybe_unused string_rc[] = { PKCS11_ID(PKCS11_CKR_OK), + PKCS11_ID(PKCS11_CKR_SLOT_ID_INVALID), PKCS11_ID(PKCS11_CKR_GENERAL_ERROR), - PKCS11_ID(PKCS11_CKR_DEVICE_MEMORY), - PKCS11_ID(PKCS11_CKR_ARGUMENTS_BAD), - PKCS11_ID(PKCS11_CKR_BUFFER_TOO_SMALL), PKCS11_ID(PKCS11_CKR_FUNCTION_FAILED), - PKCS11_ID(PKCS11_CKR_SIGNATURE_INVALID), + PKCS11_ID(PKCS11_CKR_ARGUMENTS_BAD), + PKCS11_ID(PKCS11_CKR_ATTRIBUTE_READ_ONLY), PKCS11_ID(PKCS11_CKR_ATTRIBUTE_SENSITIVE), PKCS11_ID(PKCS11_CKR_ATTRIBUTE_TYPE_INVALID), PKCS11_ID(PKCS11_CKR_ATTRIBUTE_VALUE_INVALID), - PKCS11_ID(PKCS11_CKR_OBJECT_HANDLE_INVALID), + PKCS11_ID(PKCS11_CKR_ACTION_PROHIBITED), + PKCS11_ID(PKCS11_CKR_DATA_LEN_RANGE), + PKCS11_ID(PKCS11_CKR_DEVICE_MEMORY), + PKCS11_ID(PKCS11_CKR_ENCRYPTED_DATA_INVALID), + PKCS11_ID(PKCS11_CKR_ENCRYPTED_DATA_LEN_RANGE), PKCS11_ID(PKCS11_CKR_KEY_HANDLE_INVALID), + PKCS11_ID(PKCS11_CKR_KEY_SIZE_RANGE), + PKCS11_ID(PKCS11_CKR_KEY_INDIGESTIBLE), + PKCS11_ID(PKCS11_CKR_KEY_FUNCTION_NOT_PERMITTED), PKCS11_ID(PKCS11_CKR_MECHANISM_INVALID), - PKCS11_ID(PKCS11_CKR_SESSION_HANDLE_INVALID), - PKCS11_ID(PKCS11_CKR_SLOT_ID_INVALID), PKCS11_ID(PKCS11_CKR_MECHANISM_PARAM_INVALID), - PKCS11_ID(PKCS11_CKR_TEMPLATE_INCONSISTENT), - PKCS11_ID(PKCS11_CKR_TEMPLATE_INCOMPLETE), + PKCS11_ID(PKCS11_CKR_OBJECT_HANDLE_INVALID), + PKCS11_ID(PKCS11_CKR_OPERATION_ACTIVE), + PKCS11_ID(PKCS11_CKR_OPERATION_NOT_INITIALIZED), PKCS11_ID(PKCS11_CKR_PIN_INCORRECT), - PKCS11_ID(PKCS11_CKR_PIN_LOCKED), - PKCS11_ID(PKCS11_CKR_PIN_EXPIRED), PKCS11_ID(PKCS11_CKR_PIN_INVALID), PKCS11_ID(PKCS11_CKR_PIN_LEN_RANGE), - PKCS11_ID(PKCS11_CKR_SESSION_EXISTS), + PKCS11_ID(PKCS11_CKR_PIN_EXPIRED), + PKCS11_ID(PKCS11_CKR_PIN_LOCKED), + PKCS11_ID(PKCS11_CKR_SESSION_HANDLE_INVALID), PKCS11_ID(PKCS11_CKR_SESSION_PARALLEL_NOT_SUPPORTED), PKCS11_ID(PKCS11_CKR_SESSION_READ_ONLY), + PKCS11_ID(PKCS11_CKR_SESSION_EXISTS), + PKCS11_ID(PKCS11_CKR_SESSION_READ_ONLY_EXISTS), PKCS11_ID(PKCS11_CKR_SESSION_READ_WRITE_SO_EXISTS), - PKCS11_ID(PKCS11_CKR_OPERATION_ACTIVE), - PKCS11_ID(PKCS11_CKR_KEY_FUNCTION_NOT_PERMITTED), - PKCS11_ID(PKCS11_CKR_OPERATION_NOT_INITIALIZED), - PKCS11_ID(PKCS11_CKR_TOKEN_WRITE_PROTECTED), + PKCS11_ID(PKCS11_CKR_SIGNATURE_INVALID), + PKCS11_ID(PKCS11_CKR_SIGNATURE_LEN_RANGE), + PKCS11_ID(PKCS11_CKR_TEMPLATE_INCOMPLETE), + PKCS11_ID(PKCS11_CKR_TEMPLATE_INCONSISTENT), PKCS11_ID(PKCS11_CKR_TOKEN_NOT_PRESENT), PKCS11_ID(PKCS11_CKR_TOKEN_NOT_RECOGNIZED), - PKCS11_ID(PKCS11_CKR_ACTION_PROHIBITED), - PKCS11_ID(PKCS11_CKR_ATTRIBUTE_READ_ONLY), - PKCS11_ID(PKCS11_CKR_PIN_TOO_WEAK), - PKCS11_ID(PKCS11_CKR_CURVE_NOT_SUPPORTED), - PKCS11_ID(PKCS11_CKR_DOMAIN_PARAMS_INVALID), + PKCS11_ID(PKCS11_CKR_TOKEN_WRITE_PROTECTED), + PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_HANDLE_INVALID), + PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_SIZE_RANGE), + PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT), PKCS11_ID(PKCS11_CKR_USER_ALREADY_LOGGED_IN), - PKCS11_ID(PKCS11_CKR_USER_ANOTHER_ALREADY_LOGGED_IN), PKCS11_ID(PKCS11_CKR_USER_NOT_LOGGED_IN), PKCS11_ID(PKCS11_CKR_USER_PIN_NOT_INITIALIZED), - PKCS11_ID(PKCS11_CKR_USER_TOO_MANY_TYPES), PKCS11_ID(PKCS11_CKR_USER_TYPE_INVALID), - PKCS11_ID(PKCS11_CKR_DATA_LEN_RANGE), - PKCS11_ID(PKCS11_CKR_ENCRYPTED_DATA_INVALID), - PKCS11_ID(PKCS11_CKR_ENCRYPTED_DATA_LEN_RANGE), - PKCS11_ID(PKCS11_CKR_KEY_SIZE_RANGE), - PKCS11_ID(PKCS11_CKR_KEY_INDIGESTIBLE), - PKCS11_ID(PKCS11_CKR_SESSION_READ_ONLY_EXISTS), - PKCS11_ID(PKCS11_CKR_SIGNATURE_LEN_RANGE), - PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_HANDLE_INVALID), - PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_SIZE_RANGE), - PKCS11_ID(PKCS11_CKR_UNWRAPPING_KEY_TYPE_INCONSISTENT), + PKCS11_ID(PKCS11_CKR_USER_ANOTHER_ALREADY_LOGGED_IN), + PKCS11_ID(PKCS11_CKR_USER_TOO_MANY_TYPES), PKCS11_ID(PKCS11_CKR_WRAPPED_KEY_INVALID), PKCS11_ID(PKCS11_CKR_WRAPPED_KEY_LEN_RANGE), PKCS11_ID(PKCS11_CKR_WRAPPING_KEY_HANDLE_INVALID), @@ -296,6 +292,10 @@ static const struct any_id __maybe_unused string_rc[] = { PKCS11_ID(PKCS11_CKR_WRAPPING_KEY_TYPE_INCONSISTENT), PKCS11_ID(PKCS11_CKR_RANDOM_SEED_NOT_SUPPORTED), PKCS11_ID(PKCS11_CKR_RANDOM_NO_RNG), + PKCS11_ID(PKCS11_CKR_DOMAIN_PARAMS_INVALID), + PKCS11_ID(PKCS11_CKR_CURVE_NOT_SUPPORTED), + PKCS11_ID(PKCS11_CKR_BUFFER_TOO_SMALL), + PKCS11_ID(PKCS11_CKR_PIN_TOO_WEAK), PKCS11_ID(PKCS11_RV_NOT_FOUND), PKCS11_ID(PKCS11_RV_NOT_IMPLEMENTED), };