diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 11:11:01 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-10-29 11:11:01 +0000 |
| commit | 8b80ab5a6950ce6515f477624794defd7531642a (patch) | |
| tree | aa8303f3806c5615fbeafc4dc82febe3cd7c24dc /src/charon/encoding | |
| parent | db67c87db3c9089ea8d2e14f617bf3d9e2af261f (diff) | |
| download | vyos-strongswan-8b80ab5a6950ce6515f477624794defd7531642a.tar.gz vyos-strongswan-8b80ab5a6950ce6515f477624794defd7531642a.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.2.8)
Diffstat (limited to 'src/charon/encoding')
| -rw-r--r-- | src/charon/encoding/message.c | 11 | ||||
| -rw-r--r-- | src/charon/encoding/payloads/cert_payload.c | 4 | ||||
| -rw-r--r-- | src/charon/encoding/payloads/vendor_id_payload.c | 7 |
3 files changed, 13 insertions, 9 deletions
diff --git a/src/charon/encoding/message.c b/src/charon/encoding/message.c index af9483192..600fe97d9 100644 --- a/src/charon/encoding/message.c +++ b/src/charon/encoding/message.c @@ -15,7 +15,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: message.c 3991 2008-05-21 17:56:21Z martin $ + * $Id: message.c 4339 2008-09-11 11:14:09Z martin $ */ #include <stdlib.h> @@ -39,6 +39,11 @@ */ #define MAX_NOTIFY_PAYLOADS 20 +/** + * Max number of delete payloads per IKEv2 Message + */ +#define MAX_DELETE_PAYLOADS 20 + typedef struct payload_rule_t payload_rule_t; @@ -299,7 +304,7 @@ static payload_rule_t informational_i_payload_rules[] = { /* payload type min max encr suff */ {NOTIFY, 0, MAX_NOTIFY_PAYLOADS, TRUE, FALSE}, {CONFIGURATION, 0, 1, TRUE, FALSE}, - {DELETE, 0, 1, TRUE, FALSE}, + {DELETE, 0, MAX_DELETE_PAYLOADS, TRUE, FALSE}, {VENDOR_ID, 0, 10, TRUE, FALSE}, }; @@ -324,7 +329,7 @@ static payload_rule_t informational_r_payload_rules[] = { /* payload type min max encr suff */ {NOTIFY, 0, MAX_NOTIFY_PAYLOADS, TRUE, FALSE}, {CONFIGURATION, 0, 1, TRUE, FALSE}, - {DELETE, 0, 1, TRUE, FALSE}, + {DELETE, 0, MAX_DELETE_PAYLOADS, TRUE, FALSE}, {VENDOR_ID, 0, 10, TRUE, FALSE}, }; diff --git a/src/charon/encoding/payloads/cert_payload.c b/src/charon/encoding/payloads/cert_payload.c index 99f504c5e..7ff334006 100644 --- a/src/charon/encoding/payloads/cert_payload.c +++ b/src/charon/encoding/payloads/cert_payload.c @@ -14,7 +14,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: cert_payload.c 3852 2008-04-18 21:27:08Z andreas $ + * $Id: cert_payload.c 4317 2008-09-02 11:00:13Z martin $ */ #include <stddef.h> @@ -229,7 +229,7 @@ static certificate_t *get_cert(private_cert_payload_t *this) return NULL; } return lib->creds->create(lib->creds, CRED_CERTIFICATE, CERT_X509, - BUILD_BLOB_ASN1_DER, chunk_clone(this->data), + BUILD_BLOB_ASN1_DER, this->data, BUILD_END); } diff --git a/src/charon/encoding/payloads/vendor_id_payload.c b/src/charon/encoding/payloads/vendor_id_payload.c index 3eacc1a72..3e47b9348 100644 --- a/src/charon/encoding/payloads/vendor_id_payload.c +++ b/src/charon/encoding/payloads/vendor_id_payload.c @@ -13,7 +13,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * $Id: vendor_id_payload.c 3589 2008-03-13 14:14:44Z martin $ + * $Id: vendor_id_payload.c 4120 2008-06-27 15:22:27Z andreas $ */ #include <stddef.h> @@ -86,9 +86,8 @@ encoding_rule_t vendor_id_payload_encodings[] = { +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ ! Next Payload !C! RESERVED ! Payload Length ! +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ - ! Cert Encoding ! ! - +-+-+-+-+-+-+-+-+ ! - ~ Certificate Data ~ + + ! + ~ VID Data ~ ! ! +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ |