transform: Add private transform for KDFs

diff --git a/src/libstrongswan/crypto/transform.c b/src/libstrongswan/crypto/transform.c
index e30208ec0054ca0f3756c8ab6986ee7adb29fba0..4ecc3e862b2693b5edc65b24299a60104ed880b4 100644 (file)
--- a/src/libstrongswan/crypto/transform.c
+++ b/src/libstrongswan/crypto/transform.c
@@ -16,6 +16,7 @@
 #include <crypto/transform.h>
 #include <crypto/hashers/hasher.h>
 #include <crypto/rngs/rng.h>
+#include <crypto/kdfs/kdf.h>
 
 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 f7892b821e1ccb4f46ae567d2e1ea7df9a4001ab..73c7b534727bfdc48f7a5b7d73b86d5772212577 100644 (file)
--- 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,
 };
 
 /**