Added proposal keywords for ESN support
authorMartin Willi <martin@revosec.ch>
Mon, 18 Apr 2011 13:43:20 +0000 (15:43 +0200)
committerMartin Willi <martin@revosec.ch>
Wed, 20 Apr 2011 10:26:58 +0000 (12:26 +0200)
src/libcharon/config/proposal.c
src/libcharon/config/proposal.h
src/libstrongswan/crypto/proposal/proposal_keywords.txt
src/libstrongswan/crypto/transform.c
src/libstrongswan/crypto/transform.h

index 86a59bc..956edac 100644 (file)
@@ -35,11 +35,6 @@ ENUM(protocol_id_names, PROTO_NONE, PROTO_ESP,
        "ESP",
 );
 
-ENUM(extended_sequence_numbers_names, NO_EXT_SEQ_NUMBERS, EXT_SEQ_NUMBERS,
-       "NO_EXT_SEQ",
-       "EXT_SEQ",
-);
-
 typedef struct private_proposal_t private_proposal_t;
 typedef struct algorithm_t algorithm_t;
 
index 97af5b6..9337518 100644 (file)
@@ -51,19 +51,6 @@ enum protocol_id_t {
 extern enum_name_t *protocol_id_names;
 
 /**
- * Extended sequence numbers, as in IKEv2 RFC 3.3.2.
- */
-enum extended_sequence_numbers_t {
-       NO_EXT_SEQ_NUMBERS = 0,
-       EXT_SEQ_NUMBERS = 1
-};
-
-/**
- * enum strings for extended_sequence_numbers_t.
- */
-extern enum_name_t *extended_sequence_numbers_names;
-
-/**
  * Stores a set of algorithms used for an SA.
  *
  * A proposal stores algorithms for a specific
index 208c671..4ef664d 100644 (file)
@@ -146,3 +146,5 @@ ecp521,           DIFFIE_HELLMAN_GROUP, ECP_521_BIT,               0
 modp1024s160,     DIFFIE_HELLMAN_GROUP, MODP_1024_160,             0
 modp2048s224,     DIFFIE_HELLMAN_GROUP, MODP_2048_224,             0
 modp2048s256,     DIFFIE_HELLMAN_GROUP, MODP_2048_256,             0
+noesn,            EXTENDED_SEQUENCE_NUMBERS, NO_EXT_SEQ_NUMBERS,   0
+esn,              EXTENDED_SEQUENCE_NUMBERS, EXT_SEQ_NUMBERS,      0
index cec90a6..1e108f1 100644 (file)
@@ -28,3 +28,8 @@ ENUM_NEXT(transform_type_names, ENCRYPTION_ALGORITHM, EXTENDED_SEQUENCE_NUMBERS,
        "EXTENDED_SEQUENCE_NUMBERS");
 ENUM_END(transform_type_names, EXTENDED_SEQUENCE_NUMBERS);
 
+
+ENUM(extended_sequence_numbers_names, NO_EXT_SEQ_NUMBERS, EXT_SEQ_NUMBERS,
+       "NO_EXT_SEQ",
+       "EXT_SEQ",
+);
index 1a26601..1393c67 100644 (file)
@@ -45,4 +45,17 @@ enum transform_type_t {
  */
 extern enum_name_t *transform_type_names;
 
+/**
+ * Extended sequence numbers, as in IKEv2 RFC 3.3.2.
+ */
+enum extended_sequence_numbers_t {
+       NO_EXT_SEQ_NUMBERS = 0,
+       EXT_SEQ_NUMBERS = 1
+};
+
+/**
+ * enum strings for extended_sequence_numbers_t.
+ */
+extern enum_name_t *extended_sequence_numbers_names;
+
 #endif /** TRANSFORM_H_ @}*/