transform: Add additional key exchange transform types

diff --git a/src/libstrongswan/crypto/transform.c b/src/libstrongswan/crypto/transform.c
index d7bc2154077dd067291dbebaebcbc7430566671e..32fd50df956db9b1ffdcff2780e697903413627d 100644 (file)
--- a/src/libstrongswan/crypto/transform.c
+++ b/src/libstrongswan/crypto/transform.c
@@ -19,14 +19,21 @@
 #include <crypto/rngs/rng.h>
 #include <crypto/kdfs/kdf.h>
 
-ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS,
+ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, ADDITIONAL_KEY_EXCHANGE_7,
        "ENCRYPTION_ALGORITHM",
        "PSEUDO_RANDOM_FUNCTION",
        "INTEGRITY_ALGORITHM",
        "KEY_EXCHANGE_METHOD",
-       "EXTENDED_SEQUENCE_NUMBERS");
+       "EXTENDED_SEQUENCE_NUMBERS",
+       "ADDITIONAL_KEY_EXCHANGE_1",
+       "ADDITIONAL_KEY_EXCHANGE_2",
+       "ADDITIONAL_KEY_EXCHANGE_3",
+       "ADDITIONAL_KEY_EXCHANGE_4",
+       "ADDITIONAL_KEY_EXCHANGE_5",
+       "ADDITIONAL_KEY_EXCHANGE_6",
+       "ADDITIONAL_KEY_EXCHANGE_7");
 ENUM_NEXT(transform_type_names, HASH_ALGORITHM, KEY_DERIVATION_FUNCTION,
-                 EXTENDED_SEQUENCE_NUMBERS,
+                 ADDITIONAL_KEY_EXCHANGE_7,
        "HASH_ALGORITHM",
        "RANDOM_NUMBER_GENERATOR",
        "AEAD_ALGORITHM",
@@ -60,6 +67,13 @@ enum_name_t* transform_get_enum_names(transform_type_t type)
                case INTEGRITY_ALGORITHM:
                        return integrity_algorithm_names;
                case KEY_EXCHANGE_METHOD:
+               case ADDITIONAL_KEY_EXCHANGE_1:
+               case ADDITIONAL_KEY_EXCHANGE_2:
+               case ADDITIONAL_KEY_EXCHANGE_3:
+               case ADDITIONAL_KEY_EXCHANGE_4:
+               case ADDITIONAL_KEY_EXCHANGE_5:
+               case ADDITIONAL_KEY_EXCHANGE_6:
+               case ADDITIONAL_KEY_EXCHANGE_7:
                        return key_exchange_method_names;
                case EXTENDED_SEQUENCE_NUMBERS:
                        return extended_sequence_numbers_names;

diff --git a/src/libstrongswan/crypto/transform.h b/src/libstrongswan/crypto/transform.h
index e96ee8ca7ed493f2fe031430ce17bed28cd6bb8c..4ec4e9b153e0c6d89c0bc628e6826ba3dc387574 100644 (file)
--- a/src/libstrongswan/crypto/transform.h
+++ b/src/libstrongswan/crypto/transform.h
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2012-2019 Tobias Brunner
  * Copyright (C) 2006-2009 Martin Willi
  *
  * Copyright (C) secunet Security Networks AG
@@ -35,6 +36,13 @@ enum transform_type_t {
        INTEGRITY_ALGORITHM = 3,
        KEY_EXCHANGE_METHOD = 4,
        EXTENDED_SEQUENCE_NUMBERS = 5,
+       ADDITIONAL_KEY_EXCHANGE_1 = 6,
+       ADDITIONAL_KEY_EXCHANGE_2 = 7,
+       ADDITIONAL_KEY_EXCHANGE_3 = 8,
+       ADDITIONAL_KEY_EXCHANGE_4 = 9,
+       ADDITIONAL_KEY_EXCHANGE_5 = 10,
+       ADDITIONAL_KEY_EXCHANGE_6 = 11,
+       ADDITIONAL_KEY_EXCHANGE_7 = 12,
        HASH_ALGORITHM = 256,
        RANDOM_NUMBER_GENERATOR = 257,
        AEAD_ALGORITHM = 258,