From e1fdb6de898ecfbd63988e805162748d3ba404af Mon Sep 17 00:00:00 2001 From: Krzysztof Jackiewicz Date: Wed, 7 Jun 2023 10:32:58 +0200 Subject: [PATCH] Extend E2EE API support back to 6.0 Change-Id: I7aff7fb9a35fa26804303a11a4cf0a8c03fb287c --- src/include/ckmc/ckmc-manager.h | 6 +++--- src/include/ckmc/ckmc-type.h | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/include/ckmc/ckmc-manager.h b/src/include/ckmc/ckmc-manager.h index dcec32a..7255a51 100644 --- a/src/include/ckmc/ckmc-manager.h +++ b/src/include/ckmc/ckmc-manager.h @@ -1104,7 +1104,7 @@ int ckmc_decrypt_data(ckmc_param_list_h params, /** * @brief Unwraps one key with another and stores it inside key manager. * - * @since_tizen 6.5 + * @since_tizen 6.0 * * @remarks The wrapping key must be either symmetric (#CKMC_KEY_AES) or private RSA * (#CKMC_KEY_RSA_PRIVATE). @@ -1164,7 +1164,7 @@ int ckmc_import_wrapped_key(const ckmc_param_list_h params, /** * @brief Wraps one key with another and returns it to the client. * - * @since_tizen 6.5 + * @since_tizen 6.0 * * @remarks The wrapping key must be either symmetric (#CKMC_KEY_AES) or public RSA * (#CKMC_KEY_RSA_PUBLIC). @@ -1215,7 +1215,7 @@ int ckmc_export_wrapped_key(const ckmc_param_list_h params, /** * @brief Derives a key from another key/secret and stores it inside key manager. * - * @since_tizen 6.5 + * @since_tizen 6.0 * * @remarks The derived key will be a symmetric one. It will be stored as a #CKMC_KEY_AES. * diff --git a/src/include/ckmc/ckmc-type.h b/src/include/ckmc/ckmc-type.h index e568655..5da5952 100644 --- a/src/include/ckmc/ckmc-type.h +++ b/src/include/ckmc/ckmc-type.h @@ -301,45 +301,45 @@ typedef enum __ckmc_param_name { CKMC_PARAM_ED_LABEL, /**< buffer - RSA OAEP label (not supported at the moment) */ CKMC_PARAM_KDF_PRF = 401, /**< integer - pseudo-random function number (see #ckmc_kdf_prf_e) - (Since 6.5) */ + (Since 6.0) */ CKMC_PARAM_KDF_LEN, /**< integer - length of the derived key in bytes. The value must be one of - {16, 24, 32} (Since 6.5) */ + {16, 24, 32} (Since 6.0) */ - CKMC_PARAM_KBKDF_MODE, /**< integer - KDF mode number (see #ckmc_kbkdf_mode_e) (Since 6.5) */ + CKMC_PARAM_KBKDF_MODE, /**< integer - KDF mode number (see #ckmc_kbkdf_mode_e) (Since 6.0) */ CKMC_PARAM_KBKDF_LABEL, /**< buffer - the purpose for the derived key. Conflicts with - #CKMC_PARAM_KBKDF_FIXED_INPUT (Since 6.5) */ + #CKMC_PARAM_KBKDF_FIXED_INPUT (Since 6.0) */ CKMC_PARAM_KBKDF_CONTEXT, /**< buffer - information related to the derived key. Conflicts with - #CKMC_PARAM_KBKDF_FIXED_INPUT (Since 6.5) */ + #CKMC_PARAM_KBKDF_FIXED_INPUT (Since 6.0) */ CKMC_PARAM_KBKDF_FIXED_INPUT, /**< buffer - KBKDF fixed input replacing context and label - (Since 6.5). Conflicts with: + (Since 6.0). Conflicts with: - #CKMC_PARAM_KBKDF_LABEL, - #CKMC_PARAM_KBKDF_CONTEXT, - #CKMC_PARAM_KBKDF_LLEN, - #CKMC_PARAM_KBKDF_NO_SEPARATOR */ CKMC_PARAM_KBKDF_COUNTER_LOCATION, /**< integer - specifies location of the counter in KBKDF - (see #ckmc_kbkdf_counter_location_e) (Since 6.5) */ + (see #ckmc_kbkdf_counter_location_e) (Since 6.0) */ CKMC_PARAM_KBKDF_RLEN, /**< integer - specifies the length of the counter representation in bits in KBKDF. The value must be one of {8, 16, 24, 32}. If not set, the - default value = 32 will be used. (Since 6.5) */ + default value = 32 will be used. (Since 6.0) */ CKMC_PARAM_KBKDF_LLEN, /**< integer - specifies the length of the length suffix representation in bits in KBKDF. The value must be one of {0, 8, 16, 24, 32}. If set to 0 the length suffix will be skipped. If not set, the default value = 32 will be used. The length suffix is skipped if #CKMC_PARAM_KBKDF_FIXED_INPUT is passed and this parameter conflicts - with it. (Since 6.5) */ + with it. (Since 6.0) */ CKMC_PARAM_KBKDF_NO_SEPARATOR, /**< integer - presence of this parameter will skip the zero octet separator between label and context in KBKDF. All values are allowed. This parameter conflicts with - #CKMC_PARAM_KBKDF_FIXED_INPUT. (Since 6.5) */ + #CKMC_PARAM_KBKDF_FIXED_INPUT. (Since 6.0) */ - CKMC_PARAM_ECDH_PUBKEY, /**< buffer - EC public key in DER form (see #ckmc_key_s) (Since 6.5) */ + CKMC_PARAM_ECDH_PUBKEY, /**< buffer - EC public key in DER form (see #ckmc_key_s) (Since 6.0) */ } ckmc_param_name_e; /** * @brief Enumeration for key derivation function pseudo-random function parameter. - * @since_tizen 6.5 + * @since_tizen 6.0 * * @see ckmc_key_derive() * @see #ckmc_param_name_e @@ -352,7 +352,7 @@ typedef enum __ckmc_kdf_prf { /** * @brief Enumeration for key based key derivation function mode. - * @since_tizen 6.5 + * @since_tizen 6.0 * * @see ckmc_key_derive() * @see #ckmc_param_name_e @@ -363,7 +363,7 @@ typedef enum __ckmc_kbkdf_mode { /** * @brief Enumeration for KBKDF counter location relative to fixed input. - * @since_tizen 6.5 + * @since_tizen 6.0 * * @see ckmc_key_derive() * @see #ckmc_param_name_e -- 2.7.4