From e93882c6a09e92bfcc9a2e139087e6199173835c Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Wed, 9 Feb 2022 15:54:47 +0100 Subject: [PATCH] transform: Add private transform for KDFs --- src/libstrongswan/crypto/transform.c | 11 +++++++---- src/libstrongswan/crypto/transform.h | 1 + 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/libstrongswan/crypto/transform.c b/src/libstrongswan/crypto/transform.c index e30208ec00..4ecc3e862b 100644 --- a/src/libstrongswan/crypto/transform.c +++ b/src/libstrongswan/crypto/transform.c @@ -16,6 +16,7 @@ #include #include #include +#include ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS, "ENCRYPTION_ALGORITHM", @@ -23,16 +24,16 @@ ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS "INTEGRITY_ALGORITHM", "DIFFIE_HELLMAN_GROUP", "EXTENDED_SEQUENCE_NUMBERS"); -ENUM_NEXT(transform_type_names, HASH_ALGORITHM, DETERMINISTIC_RANDOM_BIT_GENERATOR, +ENUM_NEXT(transform_type_names, HASH_ALGORITHM, KEY_DERIVATION_FUNCTION, EXTENDED_SEQUENCE_NUMBERS, "HASH_ALGORITHM", "RANDOM_NUMBER_GENERATOR", "AEAD_ALGORITHM", "COMPRESSION_ALGORITHM", "EXTENDED OUTPUT FUNCTION", - "DETERMINISTIC RANDOM BIT GENERATOR"); -ENUM_END(transform_type_names, DETERMINISTIC_RANDOM_BIT_GENERATOR); - + "DETERMINISTIC RANDOM BIT GENERATOR", + "KEY_DERIVATION_FUNCTION"); +ENUM_END(transform_type_names, KEY_DERIVATION_FUNCTION); ENUM(extended_sequence_numbers_names, NO_EXT_SEQ_NUMBERS, EXT_SEQ_NUMBERS, "NO_EXT_SEQ", @@ -65,6 +66,8 @@ enum_name_t* transform_get_enum_names(transform_type_t type) return ext_out_function_names; case DETERMINISTIC_RANDOM_BIT_GENERATOR: return drbg_type_names; + case KEY_DERIVATION_FUNCTION: + return key_derivation_function_names; case COMPRESSION_ALGORITHM: break; } diff --git a/src/libstrongswan/crypto/transform.h b/src/libstrongswan/crypto/transform.h index f7892b821e..73c7b53472 100644 --- a/src/libstrongswan/crypto/transform.h +++ b/src/libstrongswan/crypto/transform.h @@ -40,6 +40,7 @@ enum transform_type_t { COMPRESSION_ALGORITHM = 259, EXTENDED_OUTPUT_FUNCTION = 260, DETERMINISTIC_RANDOM_BIT_GENERATOR = 261, + KEY_DERIVATION_FUNCTION = 262, }; /** -- 2.47.2