denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

transform: Move internal identifiers out of private range

Browse Source 
Avoid any conflicts if implementations use transform types in the
private range.
Also removed the unused UNKNOWN_TRANSFORM_TYPE identifier.
This commit is contained in:
Tobias Brunner
2018-03-05 12:05:36 +01:00
parent 0d06cbd66e
commit ec1ebb2377
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/crypto/transform.c
+9 -11
View File
@@ -17,21 +17,20 @@
#include <crypto/hashers/hasher.h> #include <crypto/hashers/hasher.h>
#include <crypto/rngs/rng.h> #include <crypto/rngs/rng.h>
ENUM_BEGIN(transform_type_names, UNDEFINED_TRANSFORM_TYPE, EXTENDED_OUTPUT_FUNCTION, ENUM_BEGIN(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS,
"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,
"ENCRYPTION_ALGORITHM", "ENCRYPTION_ALGORITHM",
"PSEUDO_RANDOM_FUNCTION", "PSEUDO_RANDOM_FUNCTION",
"INTEGRITY_ALGORITHM", "INTEGRITY_ALGORITHM",
"DIFFIE_HELLMAN_GROUP", "DIFFIE_HELLMAN_GROUP",
"EXTENDED_SEQUENCE_NUMBERS"); "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, 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; return extended_sequence_numbers_names;
case EXTENDED_OUTPUT_FUNCTION: case EXTENDED_OUTPUT_FUNCTION:
return ext_out_function_names; return ext_out_function_names;
case UNDEFINED_TRANSFORM_TYPE:
case COMPRESSION_ALGORITHM: case COMPRESSION_ALGORITHM:
break; break;
} }
src/libstrongswan/crypto/transform.h
+6 -7
View File
@@ -29,17 +29,16 @@ typedef enum transform_type_t transform_type_t;
* Type of a transform, as in IKEv2 RFC 3.3.2. * Type of a transform, as in IKEv2 RFC 3.3.2.
*/ */
enum transform_type_t { 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, ENCRYPTION_ALGORITHM = 1,
PSEUDO_RANDOM_FUNCTION = 2, PSEUDO_RANDOM_FUNCTION = 2,
INTEGRITY_ALGORITHM = 3, INTEGRITY_ALGORITHM = 3,
DIFFIE_HELLMAN_GROUP = 4, 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,
}; };
/** /**