diff options
| author | Jan Hutter <jhutter@hsr.ch> | 2005-11-29 09:57:22 +0000 |
|---|---|---|
| committer | Jan Hutter <jhutter@hsr.ch> | 2005-11-29 09:57:22 +0000 |
| commit | db6e764580f29c658a3f5486b74e13ad4de7abd4 (patch) | |
| tree | 050666c2ee034daa6fb808190bf2dd24f99a62f1 /Source/charon/encoding/payloads | |
| parent | a0753941e115fa450b3f750427a3755535cfe2fb (diff) | |
| download | strongswan-db6e764580f29c658a3f5486b74e13ad4de7abd4.tar.bz2 strongswan-db6e764580f29c658a3f5486b74e13ad4de7abd4.tar.xz | |
- added and tested id_payload_t
Diffstat (limited to 'Source/charon/encoding/payloads')
| -rw-r--r-- | Source/charon/encoding/payloads/Makefile.payloads | 4 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encodings.c | 2 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/encodings.h | 13 | ||||
| -rw-r--r-- | Source/charon/encoding/payloads/payload.c | 5 |
4 files changed, 24 insertions, 0 deletions
diff --git a/Source/charon/encoding/payloads/Makefile.payloads b/Source/charon/encoding/payloads/Makefile.payloads index e32dd5b81..0f71d189f 100644 --- a/Source/charon/encoding/payloads/Makefile.payloads +++ b/Source/charon/encoding/payloads/Makefile.payloads @@ -34,6 +34,10 @@ OBJS+= $(BUILD_DIR)notify_payload.o $(BUILD_DIR)notify_payload.o : $(PAYLOADS_DIR)notify_payload.c $(PAYLOADS_DIR)notify_payload.h $(CC) $(CFLAGS) -c -o $@ $< +OBJS+= $(BUILD_DIR)id_payload.o +$(BUILD_DIR)id_payload.o : $(PAYLOADS_DIR)id_payload.c $(PAYLOADS_DIR)id_payload.h + $(CC) $(CFLAGS) -c -o $@ $< + OBJS+= $(BUILD_DIR)payload.o $(BUILD_DIR)payload.o : $(PAYLOADS_DIR)payload.c $(PAYLOADS_DIR)payload.h $(CC) $(CFLAGS) -c -o $@ $< diff --git a/Source/charon/encoding/payloads/encodings.c b/Source/charon/encoding/payloads/encodings.c index ab8c3f70e..5d42542f7 100644 --- a/Source/charon/encoding/payloads/encodings.c +++ b/Source/charon/encoding/payloads/encodings.c @@ -48,5 +48,7 @@ mapping_t encoding_type_m[] = { {ATTRIBUTE_LENGTH_OR_VALUE, "ATTRIBUTE_LENGTH_OR_VALUE"}, {ATTRIBUTE_VALUE, "ATTRIBUTE_VALUE"}, {NONCE_DATA, "NONCE_DATA"}, + {ID_DATA, "ID_DATA"}, + {ENCRYPTED_DATA, "ENCRYPTED_DATA"}, {MAPPING_END, NULL} }; diff --git a/Source/charon/encoding/payloads/encodings.h b/Source/charon/encoding/payloads/encodings.h index 309527b38..d39453a49 100644 --- a/Source/charon/encoding/payloads/encodings.h +++ b/Source/charon/encoding/payloads/encodings.h @@ -308,6 +308,16 @@ enum encoding_type_t{ * When parsing (Payload Length - 4) bytes are read and written into the chunk pointing to. */ NONCE_DATA, + + /** + * Representating a ID Data field. + * + * When generating the content of the chunkt pointing to + * is written. + * + * When parsing (Payload Length - 8) bytes are read and written into the chunk pointing to. + */ + ID_DATA, /** * Representating an IKE_SPI field in an IKEv2 Header. @@ -319,6 +329,9 @@ enum encoding_type_t{ */ IKE_SPI, + /** + * Representing the encrypted data body of a encryption payload. + */ ENCRYPTED_DATA, }; diff --git a/Source/charon/encoding/payloads/payload.c b/Source/charon/encoding/payloads/payload.c index a2333f6af..845250da4 100644 --- a/Source/charon/encoding/payloads/payload.c +++ b/Source/charon/encoding/payloads/payload.c @@ -27,6 +27,7 @@ #include <encoding/payloads/ike_header.h> #include <encoding/payloads/sa_payload.h> #include <encoding/payloads/nonce_payload.h> +#include <encoding/payloads/id_payload.h> #include <encoding/payloads/ke_payload.h> #include <encoding/payloads/notify_payload.h> @@ -81,6 +82,10 @@ payload_t *payload_create(payload_type_t type) return (payload_t*)transform_attribute_create(); case NONCE: return (payload_t*)nonce_payload_create(); + case ID_INITIATOR: + return (payload_t*)id_payload_create(TRUE); + case ID_RESPONDER: + return (payload_t*)id_payload_create(FALSE); case KEY_EXCHANGE: return (payload_t*)ke_payload_create(); case NOTIFY: |