From: Tobias Brunner <tobias@strongswan.org>
Date: Fri, 23 Feb 2018 07:12:48 +0000 (+0100)
Subject: transform: Move internal identifiers out of private range
X-Git-Tag: 5.6.3dr1~35^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ec1ebb2377add71ef45c81d717aa9a83bd38b86c;p=thirdparty%2Fstrongswan.git

transform: Move internal identifiers out of private range

Avoid any conflicts if implementations use transform types in the
private range.
Also removed the unused UNKNOWN_TRANSFORM_TYPE identifier.
---

diff --git a/src/libstrongswan/crypto/transform.c b/src/libstrongswan/crypto/transform.c
index 808cb996e5..2875fbb653 100644
--- a/src/libstrongswan/crypto/transform.c
+++ b/src/libstrongswan/crypto/transform.c
@@ -17,21 +17,20 @@
 #include <crypto/hashers/hasher.h>
 #include <crypto/rngs/rng.h>
 
-ENUM_BEGIN(transform_type_names, UNDEFINED_TRANSFORM_TYPE, EXTENDED_OUTPUT_FUNCTION,
-	"UNDEFINED_TRANSFORM_TYPE",
-	"HASH_ALGORITHM",
-	"RANDOM_NUMBER_GENERATOR",
-	"AEAD_ALGORITHM",
-	"COMPRESSION_ALGORITHM",
-	"EXTENDED OUTPUT FUNCTION");
-ENUM_NEXT(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS,
-								EXTENDED_OUTPUT_FUNCTION,
+ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS,
 	"ENCRYPTION_ALGORITHM",
 	"PSEUDO_RANDOM_FUNCTION",
 	"INTEGRITY_ALGORITHM",
 	"DIFFIE_HELLMAN_GROUP",
 	"EXTENDED_SEQUENCE_NUMBERS");
-ENUM_END(transform_type_names, EXTENDED_SEQUENCE_NUMBERS);
+ENUM_NEXT(transform_type_names, HASH_ALGORITHM, EXTENDED_OUTPUT_FUNCTION,
+		  EXTENDED_SEQUENCE_NUMBERS,
+	"HASH_ALGORITHM",
+	"RANDOM_NUMBER_GENERATOR",
+	"AEAD_ALGORITHM",
+	"COMPRESSION_ALGORITHM",
+	"EXTENDED OUTPUT FUNCTION");
+ENUM_END(transform_type_names, EXTENDED_OUTPUT_FUNCTION);
 
 
 ENUM(extended_sequence_numbers_names, NO_EXT_SEQ_NUMBERS, EXT_SEQ_NUMBERS,
@@ -64,7 +63,6 @@ enum_name_t* transform_get_enum_names(transform_type_t type)
 			return extended_sequence_numbers_names;
 		case EXTENDED_OUTPUT_FUNCTION:
 			return ext_out_function_names;
-		case UNDEFINED_TRANSFORM_TYPE:
 		case COMPRESSION_ALGORITHM:
 			break;
 	}
diff --git a/src/libstrongswan/crypto/transform.h b/src/libstrongswan/crypto/transform.h
index e043e605ce..9181655e3b 100644
--- a/src/libstrongswan/crypto/transform.h
+++ b/src/libstrongswan/crypto/transform.h
@@ -29,17 +29,16 @@ typedef enum transform_type_t transform_type_t;
  * Type of a transform, as in IKEv2 RFC 3.3.2.
  */
 enum transform_type_t {
-	UNDEFINED_TRANSFORM_TYPE = 241,
-	HASH_ALGORITHM = 242,
-	RANDOM_NUMBER_GENERATOR = 243,
-	AEAD_ALGORITHM = 244,
-	COMPRESSION_ALGORITHM = 245,
-	EXTENDED_OUTPUT_FUNCTION = 246,
 	ENCRYPTION_ALGORITHM = 1,
 	PSEUDO_RANDOM_FUNCTION = 2,
 	INTEGRITY_ALGORITHM = 3,
 	DIFFIE_HELLMAN_GROUP = 4,
-	EXTENDED_SEQUENCE_NUMBERS = 5
+	EXTENDED_SEQUENCE_NUMBERS = 5,
+	HASH_ALGORITHM = 256,
+	RANDOM_NUMBER_GENERATOR = 257,
+	AEAD_ALGORITHM = 258,
+	COMPRESSION_ALGORITHM = 259,
+	EXTENDED_OUTPUT_FUNCTION = 260,
 };
 
 /**