ims-volte-vowifi
/
strongswan
9
0
Fork 0
Code Pull Requests Releases Activity

transform: Add additional key exchange transform types

This commit is contained in:
Tobias Brunner 2019-10-25 14:20:59 +02:00 committed by Andreas Steffen
parent 13f2461e6b
commit 46e074985a
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libstrongswan/crypto/transform.c
View File

@ -1,4 +1,5 @@
/*
* Copyright (C) 2012-2019 Tobias Brunner
* Copyright (C) 2006-2009 Martin Willi
* HSR Hochschule fuer Technik Rapperswil
*
@ -17,14 +18,21 @@
#include <crypto/hashers/hasher.h>
#include <crypto/rngs/rng.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, DETERMINISTIC_RANDOM_BIT_GENERATOR,
EXTENDED_SEQUENCE_NUMBERS,
ADDITIONAL_KEY_EXCHANGE_7,
"HASH_ALGORITHM",
"RANDOM_NUMBER_GENERATOR",
"AEAD_ALGORITHM",
@ -58,6 +66,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;

8
src/libstrongswan/crypto/transform.h
View File

@ -1,4 +1,5 @@
/*
* Copyright (C) 2012-2019 Tobias Brunner
* Copyright (C) 2006-2009 Martin Willi
* HSR Hochschule fuer Technik Rapperswil
*
@ -34,6 +35,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,