1999-10-18 05:59:12 +08:00
|
|
|
/*
|
1999-10-30 13:11:06 +08:00
|
|
|
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
|
|
|
|
* All rights reserved.
|
2002-06-12 01:08:37 +08:00
|
|
|
*
|
1999-10-18 05:59:12 +08:00
|
|
|
* Redistribution and use in source and binary forms, with or without
|
1999-10-30 13:11:06 +08:00
|
|
|
* modification, are permitted provided that the following conditions
|
|
|
|
* are met:
|
|
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer.
|
|
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
|
|
* documentation and/or other materials provided with the distribution.
|
|
|
|
* 3. Neither the name of the project nor the names of its contributors
|
|
|
|
* may be used to endorse or promote products derived from this software
|
|
|
|
* without specific prior written permission.
|
2002-06-12 01:08:37 +08:00
|
|
|
*
|
1999-10-30 13:11:06 +08:00
|
|
|
* THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
|
|
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
|
|
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
|
|
* SUCH DAMAGE.
|
1999-10-18 05:59:12 +08:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-08-14 21:42:19 +08:00
|
|
|
/* \summary: Internet Security Association and Key Management Protocol (ISAKMP) printer */
|
|
|
|
|
1999-11-21 17:36:43 +08:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
#include "config.h"
|
1999-10-18 05:59:12 +08:00
|
|
|
#endif
|
|
|
|
|
2013-06-09 16:26:04 +08:00
|
|
|
/* The functions from print-esp.c used in this file are only defined when both
|
|
|
|
* OpenSSL and evp.h are detected. Employ the same preprocessor device here.
|
|
|
|
*/
|
|
|
|
#ifndef HAVE_OPENSSL_EVP_H
|
|
|
|
#undef HAVE_LIBCRYPTO
|
|
|
|
#endif
|
|
|
|
|
2015-09-10 04:42:38 +08:00
|
|
|
#include <netdissect-stdinc.h>
|
1999-10-18 05:59:12 +08:00
|
|
|
|
2002-08-01 16:52:55 +08:00
|
|
|
#include <string.h>
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-09-06 05:35:58 +08:00
|
|
|
#include "netdissect.h"
|
1999-10-18 05:59:12 +08:00
|
|
|
#include "addrtoname.h"
|
2015-09-07 21:01:46 +08:00
|
|
|
#include "extract.h"
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2000-09-23 16:54:24 +08:00
|
|
|
#include "ip.h"
|
2000-10-07 13:53:09 +08:00
|
|
|
#include "ip6.h"
|
2017-08-27 21:15:17 +08:00
|
|
|
#include "ipproto.h"
|
2000-09-23 16:54:24 +08:00
|
|
|
|
2013-12-31 14:52:15 +08:00
|
|
|
/* refer to RFC 2408 */
|
|
|
|
|
|
|
|
typedef u_char cookie_t[8];
|
|
|
|
typedef u_char msgid_t[4];
|
|
|
|
|
|
|
|
#define PORT_ISAKMP 500
|
|
|
|
|
|
|
|
/* 3.1 ISAKMP Header Format (IKEv1 and IKEv2)
|
|
|
|
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Initiator !
|
|
|
|
! Cookie !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Responder !
|
|
|
|
! Cookie !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Next Payload ! MjVer ! MnVer ! Exchange Type ! Flags !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Message ID !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Length !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
*/
|
|
|
|
struct isakmp {
|
|
|
|
cookie_t i_ck; /* Initiator Cookie */
|
|
|
|
cookie_t r_ck; /* Responder Cookie */
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t np; /* Next Payload Type */
|
|
|
|
uint8_t vers;
|
2013-12-31 14:52:15 +08:00
|
|
|
#define ISAKMP_VERS_MAJOR 0xf0
|
|
|
|
#define ISAKMP_VERS_MAJOR_SHIFT 4
|
|
|
|
#define ISAKMP_VERS_MINOR 0x0f
|
|
|
|
#define ISAKMP_VERS_MINOR_SHIFT 0
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t etype; /* Exchange Type */
|
|
|
|
uint8_t flags; /* Flags */
|
2013-12-31 14:52:15 +08:00
|
|
|
msgid_t msgid;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t len; /* Length */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Next Payload Type */
|
|
|
|
#define ISAKMP_NPTYPE_NONE 0 /* NONE*/
|
|
|
|
#define ISAKMP_NPTYPE_SA 1 /* Security Association */
|
|
|
|
#define ISAKMP_NPTYPE_P 2 /* Proposal */
|
|
|
|
#define ISAKMP_NPTYPE_T 3 /* Transform */
|
|
|
|
#define ISAKMP_NPTYPE_KE 4 /* Key Exchange */
|
|
|
|
#define ISAKMP_NPTYPE_ID 5 /* Identification */
|
|
|
|
#define ISAKMP_NPTYPE_CERT 6 /* Certificate */
|
|
|
|
#define ISAKMP_NPTYPE_CR 7 /* Certificate Request */
|
|
|
|
#define ISAKMP_NPTYPE_HASH 8 /* Hash */
|
|
|
|
#define ISAKMP_NPTYPE_SIG 9 /* Signature */
|
|
|
|
#define ISAKMP_NPTYPE_NONCE 10 /* Nonce */
|
|
|
|
#define ISAKMP_NPTYPE_N 11 /* Notification */
|
|
|
|
#define ISAKMP_NPTYPE_D 12 /* Delete */
|
|
|
|
#define ISAKMP_NPTYPE_VID 13 /* Vendor ID */
|
|
|
|
#define ISAKMP_NPTYPE_v2E 46 /* v2 Encrypted payload */
|
|
|
|
|
|
|
|
#define IKEv1_MAJOR_VERSION 1
|
|
|
|
#define IKEv1_MINOR_VERSION 0
|
|
|
|
|
|
|
|
#define IKEv2_MAJOR_VERSION 2
|
|
|
|
#define IKEv2_MINOR_VERSION 0
|
|
|
|
|
|
|
|
/* Flags */
|
|
|
|
#define ISAKMP_FLAG_E 0x01 /* Encryption Bit */
|
|
|
|
#define ISAKMP_FLAG_C 0x02 /* Commit Bit */
|
|
|
|
#define ISAKMP_FLAG_extra 0x04
|
|
|
|
|
|
|
|
/* IKEv2 */
|
|
|
|
#define ISAKMP_FLAG_I (1 << 3) /* (I)nitiator */
|
|
|
|
#define ISAKMP_FLAG_V (1 << 4) /* (V)ersion */
|
|
|
|
#define ISAKMP_FLAG_R (1 << 5) /* (R)esponse */
|
|
|
|
|
|
|
|
|
|
|
|
/* 3.2 Payload Generic Header
|
|
|
|
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
! Next Payload ! RESERVED ! Payload Length !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
*/
|
|
|
|
struct isakmp_gen {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t np; /* Next Payload */
|
|
|
|
uint8_t critical; /* bit 7 - critical, rest is RESERVED */
|
|
|
|
uint16_t len; /* Payload Length */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.3 Data Attributes
|
|
|
|
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
!A! Attribute Type ! AF=0 Attribute Length !
|
|
|
|
!F! ! AF=1 Attribute Value !
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
. AF=0 Attribute Value .
|
|
|
|
. AF=1 Not Transmitted .
|
|
|
|
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
|
|
*/
|
|
|
|
struct isakmp_data {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t type; /* defined by DOI-spec, and Attribute Format */
|
|
|
|
uint16_t lorv; /* if f equal 1, Attribute Length */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* if f equal 0, Attribute Value */
|
|
|
|
/* if f equal 1, Attribute Value */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.4 Security Association Payload */
|
|
|
|
/* MAY NOT be used, because of being defined in ipsec-doi. */
|
|
|
|
/*
|
|
|
|
If the current payload is the last in the message,
|
|
|
|
then the value of the next payload field will be 0.
|
|
|
|
This field MUST NOT contain the
|
|
|
|
values for the Proposal or Transform payloads as they are considered
|
|
|
|
part of the security association negotiation. For example, this
|
|
|
|
field would contain the value "10" (Nonce payload) in the first
|
|
|
|
message of a Base Exchange (see Section 4.4) and the value "0" in the
|
|
|
|
first message of an Identity Protect Exchange (see Section 4.5).
|
|
|
|
*/
|
|
|
|
struct ikev1_pl_sa {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi; /* Domain of Interpretation */
|
|
|
|
uint32_t sit; /* Situation */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.5 Proposal Payload */
|
|
|
|
/*
|
|
|
|
The value of the next payload field MUST only contain the value "2"
|
|
|
|
or "0". If there are additional Proposal payloads in the message,
|
|
|
|
then this field will be 2. If the current Proposal payload is the
|
|
|
|
last within the security association proposal, then this field will
|
|
|
|
be 0.
|
|
|
|
*/
|
|
|
|
struct ikev1_pl_p {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t p_no; /* Proposal # */
|
|
|
|
uint8_t prot_id; /* Protocol */
|
|
|
|
uint8_t spi_size; /* SPI Size */
|
|
|
|
uint8_t num_t; /* Number of Transforms */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* SPI */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.6 Transform Payload */
|
|
|
|
/*
|
|
|
|
The value of the next payload field MUST only contain the value "3"
|
|
|
|
or "0". If there are additional Transform payloads in the proposal,
|
|
|
|
then this field will be 3. If the current Transform payload is the
|
|
|
|
last within the proposal, then this field will be 0.
|
|
|
|
*/
|
|
|
|
struct ikev1_pl_t {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t t_no; /* Transform # */
|
|
|
|
uint8_t t_id; /* Transform-Id */
|
|
|
|
uint16_t reserved; /* RESERVED2 */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* SA Attributes */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.7 Key Exchange Payload */
|
|
|
|
struct ikev1_pl_ke {
|
|
|
|
struct isakmp_gen h;
|
|
|
|
/* Key Exchange Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.8 Identification Payload */
|
|
|
|
/* MUST NOT to be used, because of being defined in ipsec-doi. */
|
|
|
|
struct ikev1_pl_id {
|
|
|
|
struct isakmp_gen h;
|
|
|
|
union {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t id_type; /* ID Type */
|
|
|
|
uint32_t doi_data; /* DOI Specific ID Data */
|
2013-12-31 14:52:15 +08:00
|
|
|
} d;
|
|
|
|
/* Identification Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.9 Certificate Payload */
|
|
|
|
struct ikev1_pl_cert {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t encode; /* Cert Encoding */
|
2013-12-31 14:52:15 +08:00
|
|
|
char cert; /* Certificate Data */
|
|
|
|
/*
|
|
|
|
This field indicates the type of
|
|
|
|
certificate or certificate-related information contained in the
|
|
|
|
Certificate Data field.
|
|
|
|
*/
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.10 Certificate Request Payload */
|
|
|
|
struct ikev1_pl_cr {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t num_cert; /* # Cert. Types */
|
2013-12-31 14:52:15 +08:00
|
|
|
/*
|
|
|
|
Certificate Types (variable length)
|
|
|
|
-- Contains a list of the types of certificates requested,
|
|
|
|
sorted in order of preference. Each individual certificate
|
|
|
|
type is 1 octet. This field is NOT requiredo
|
|
|
|
*/
|
|
|
|
/* # Certificate Authorities (1 octet) */
|
|
|
|
/* Certificate Authorities (variable length) */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.11 Hash Payload */
|
|
|
|
/* may not be used, because of having only data. */
|
|
|
|
struct ikev1_pl_hash {
|
|
|
|
struct isakmp_gen h;
|
|
|
|
/* Hash Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.12 Signature Payload */
|
|
|
|
/* may not be used, because of having only data. */
|
|
|
|
struct ikev1_pl_sig {
|
|
|
|
struct isakmp_gen h;
|
|
|
|
/* Signature Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.13 Nonce Payload */
|
|
|
|
/* may not be used, because of having only data. */
|
|
|
|
struct ikev1_pl_nonce {
|
|
|
|
struct isakmp_gen h;
|
|
|
|
/* Nonce Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.14 Notification Payload */
|
|
|
|
struct ikev1_pl_n {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi; /* Domain of Interpretation */
|
|
|
|
uint8_t prot_id; /* Protocol-ID */
|
|
|
|
uint8_t spi_size; /* SPI Size */
|
|
|
|
uint16_t type; /* Notify Message Type */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* SPI */
|
|
|
|
/* Notification Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.14.1 Notify Message Types */
|
|
|
|
/* NOTIFY MESSAGES - ERROR TYPES */
|
|
|
|
#define ISAKMP_NTYPE_INVALID_PAYLOAD_TYPE 1
|
|
|
|
#define ISAKMP_NTYPE_DOI_NOT_SUPPORTED 2
|
|
|
|
#define ISAKMP_NTYPE_SITUATION_NOT_SUPPORTED 3
|
|
|
|
#define ISAKMP_NTYPE_INVALID_COOKIE 4
|
|
|
|
#define ISAKMP_NTYPE_INVALID_MAJOR_VERSION 5
|
|
|
|
#define ISAKMP_NTYPE_INVALID_MINOR_VERSION 6
|
|
|
|
#define ISAKMP_NTYPE_INVALID_EXCHANGE_TYPE 7
|
|
|
|
#define ISAKMP_NTYPE_INVALID_FLAGS 8
|
|
|
|
#define ISAKMP_NTYPE_INVALID_MESSAGE_ID 9
|
|
|
|
#define ISAKMP_NTYPE_INVALID_PROTOCOL_ID 10
|
|
|
|
#define ISAKMP_NTYPE_INVALID_SPI 11
|
|
|
|
#define ISAKMP_NTYPE_INVALID_TRANSFORM_ID 12
|
|
|
|
#define ISAKMP_NTYPE_ATTRIBUTES_NOT_SUPPORTED 13
|
|
|
|
#define ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN 14
|
|
|
|
#define ISAKMP_NTYPE_BAD_PROPOSAL_SYNTAX 15
|
|
|
|
#define ISAKMP_NTYPE_PAYLOAD_MALFORMED 16
|
|
|
|
#define ISAKMP_NTYPE_INVALID_KEY_INFORMATION 17
|
|
|
|
#define ISAKMP_NTYPE_INVALID_ID_INFORMATION 18
|
|
|
|
#define ISAKMP_NTYPE_INVALID_CERT_ENCODING 19
|
|
|
|
#define ISAKMP_NTYPE_INVALID_CERTIFICATE 20
|
|
|
|
#define ISAKMP_NTYPE_BAD_CERT_REQUEST_SYNTAX 21
|
|
|
|
#define ISAKMP_NTYPE_INVALID_CERT_AUTHORITY 22
|
|
|
|
#define ISAKMP_NTYPE_INVALID_HASH_INFORMATION 23
|
|
|
|
#define ISAKMP_NTYPE_AUTHENTICATION_FAILED 24
|
|
|
|
#define ISAKMP_NTYPE_INVALID_SIGNATURE 25
|
|
|
|
#define ISAKMP_NTYPE_ADDRESS_NOTIFICATION 26
|
|
|
|
|
|
|
|
/* 3.15 Delete Payload */
|
|
|
|
struct ikev1_pl_d {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi; /* Domain of Interpretation */
|
|
|
|
uint8_t prot_id; /* Protocol-Id */
|
|
|
|
uint8_t spi_size; /* SPI Size */
|
|
|
|
uint16_t num_spi; /* # of SPIs */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* SPI(es) */
|
|
|
|
};
|
|
|
|
|
|
|
|
struct ikev1_ph1tab {
|
|
|
|
struct ikev1_ph1 *head;
|
|
|
|
struct ikev1_ph1 *tail;
|
|
|
|
int len;
|
|
|
|
};
|
|
|
|
|
|
|
|
struct isakmp_ph2tab {
|
|
|
|
struct ikev1_ph2 *head;
|
|
|
|
struct ikev1_ph2 *tail;
|
|
|
|
int len;
|
|
|
|
};
|
|
|
|
|
|
|
|
/* IKEv2 (RFC4306) */
|
|
|
|
|
|
|
|
/* 3.3 Security Association Payload -- generic header */
|
|
|
|
/* 3.3.1. Proposal Substructure */
|
|
|
|
struct ikev2_p {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t p_no; /* Proposal # */
|
|
|
|
uint8_t prot_id; /* Protocol */
|
|
|
|
uint8_t spi_size; /* SPI Size */
|
|
|
|
uint8_t num_t; /* Number of Transforms */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.3.2. Transform Substructure */
|
|
|
|
struct ikev2_t {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t t_type; /* Transform Type (ENCR,PRF,INTEG,etc.*/
|
|
|
|
uint8_t res2; /* reserved byte */
|
|
|
|
uint16_t t_id; /* Transform ID */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
enum ikev2_t_type {
|
|
|
|
IV2_T_ENCR = 1,
|
|
|
|
IV2_T_PRF = 2,
|
|
|
|
IV2_T_INTEG= 3,
|
|
|
|
IV2_T_DH = 4,
|
2015-08-19 22:44:52 +08:00
|
|
|
IV2_T_ESN = 5
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.4. Key Exchange Payload */
|
|
|
|
struct ikev2_ke {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t ke_group;
|
|
|
|
uint16_t ke_res1;
|
2013-12-31 14:52:15 +08:00
|
|
|
/* KE data */
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* 3.5. Identification Payloads */
|
|
|
|
enum ikev2_id_type {
|
|
|
|
ID_IPV4_ADDR=1,
|
|
|
|
ID_FQDN=2,
|
|
|
|
ID_RFC822_ADDR=3,
|
|
|
|
ID_IPV6_ADDR=5,
|
|
|
|
ID_DER_ASN1_DN=9,
|
|
|
|
ID_DER_ASN1_GN=10,
|
2015-08-19 22:44:52 +08:00
|
|
|
ID_KEY_ID=11
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
struct ikev2_id {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t type; /* ID type */
|
|
|
|
uint8_t res1;
|
|
|
|
uint16_t res2;
|
2013-12-31 14:52:15 +08:00
|
|
|
/* SPI */
|
|
|
|
/* Notification Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* 3.10 Notification Payload */
|
|
|
|
struct ikev2_n {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t prot_id; /* Protocol-ID */
|
|
|
|
uint8_t spi_size; /* SPI Size */
|
|
|
|
uint16_t type; /* Notify Message Type */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
enum ikev2_n_type {
|
|
|
|
IV2_NOTIFY_UNSUPPORTED_CRITICAL_PAYLOAD = 1,
|
|
|
|
IV2_NOTIFY_INVALID_IKE_SPI = 4,
|
|
|
|
IV2_NOTIFY_INVALID_MAJOR_VERSION = 5,
|
|
|
|
IV2_NOTIFY_INVALID_SYNTAX = 7,
|
|
|
|
IV2_NOTIFY_INVALID_MESSAGE_ID = 9,
|
|
|
|
IV2_NOTIFY_INVALID_SPI =11,
|
|
|
|
IV2_NOTIFY_NO_PROPOSAL_CHOSEN =14,
|
|
|
|
IV2_NOTIFY_INVALID_KE_PAYLOAD =17,
|
|
|
|
IV2_NOTIFY_AUTHENTICATION_FAILED =24,
|
|
|
|
IV2_NOTIFY_SINGLE_PAIR_REQUIRED =34,
|
|
|
|
IV2_NOTIFY_NO_ADDITIONAL_SAS =35,
|
|
|
|
IV2_NOTIFY_INTERNAL_ADDRESS_FAILURE =36,
|
|
|
|
IV2_NOTIFY_FAILED_CP_REQUIRED =37,
|
|
|
|
IV2_NOTIFY_INVALID_SELECTORS =39,
|
|
|
|
IV2_NOTIFY_INITIAL_CONTACT =16384,
|
|
|
|
IV2_NOTIFY_SET_WINDOW_SIZE =16385,
|
|
|
|
IV2_NOTIFY_ADDITIONAL_TS_POSSIBLE =16386,
|
|
|
|
IV2_NOTIFY_IPCOMP_SUPPORTED =16387,
|
|
|
|
IV2_NOTIFY_NAT_DETECTION_SOURCE_IP =16388,
|
|
|
|
IV2_NOTIFY_NAT_DETECTION_DESTINATION_IP =16389,
|
|
|
|
IV2_NOTIFY_COOKIE =16390,
|
|
|
|
IV2_NOTIFY_USE_TRANSPORT_MODE =16391,
|
|
|
|
IV2_NOTIFY_HTTP_CERT_LOOKUP_SUPPORTED =16392,
|
|
|
|
IV2_NOTIFY_REKEY_SA =16393,
|
|
|
|
IV2_NOTIFY_ESP_TFC_PADDING_NOT_SUPPORTED =16394,
|
|
|
|
IV2_NOTIFY_NON_FIRST_FRAGMENTS_ALSO =16395
|
|
|
|
};
|
|
|
|
|
|
|
|
struct notify_messages {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t type;
|
2013-12-31 14:52:15 +08:00
|
|
|
char *msg;
|
|
|
|
};
|
|
|
|
|
2017-02-07 06:33:50 +08:00
|
|
|
/* 3.8 Authentication Payload */
|
2013-12-31 14:52:15 +08:00
|
|
|
struct ikev2_auth {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t auth_method; /* Protocol-ID */
|
|
|
|
uint8_t reserved[3];
|
2013-12-31 14:52:15 +08:00
|
|
|
/* authentication data */
|
|
|
|
};
|
|
|
|
|
|
|
|
enum ikev2_auth_type {
|
|
|
|
IV2_RSA_SIG = 1,
|
|
|
|
IV2_SHARED = 2,
|
2015-08-19 22:44:52 +08:00
|
|
|
IV2_DSS_SIG = 3
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* refer to RFC 2409 */
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* isakmp sa structure */
|
|
|
|
struct oakley_sa {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t proto_id; /* OAKLEY */
|
2013-12-31 14:52:15 +08:00
|
|
|
vchar_t *spi; /* spi */
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t dhgrp; /* DH; group */
|
|
|
|
uint8_t auth_t; /* method of authentication */
|
|
|
|
uint8_t prf_t; /* type of prf */
|
|
|
|
uint8_t hash_t; /* type of hash */
|
|
|
|
uint8_t enc_t; /* type of cipher */
|
|
|
|
uint8_t life_t; /* type of duration of lifetime */
|
|
|
|
uint32_t ldur; /* life duration */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* refer to RFC 2407 */
|
|
|
|
|
|
|
|
#define IPSEC_DOI 1
|
|
|
|
|
|
|
|
/* 4.2 IPSEC Situation Definition */
|
|
|
|
#define IPSECDOI_SIT_IDENTITY_ONLY 0x00000001
|
|
|
|
#define IPSECDOI_SIT_SECRECY 0x00000002
|
|
|
|
#define IPSECDOI_SIT_INTEGRITY 0x00000004
|
|
|
|
|
|
|
|
/* 4.4.1 IPSEC Security Protocol Identifiers */
|
|
|
|
/* 4.4.2 IPSEC ISAKMP Transform Values */
|
|
|
|
#define IPSECDOI_PROTO_ISAKMP 1
|
|
|
|
#define IPSECDOI_KEY_IKE 1
|
|
|
|
|
|
|
|
/* 4.4.1 IPSEC Security Protocol Identifiers */
|
|
|
|
#define IPSECDOI_PROTO_IPSEC_AH 2
|
|
|
|
/* 4.4.3 IPSEC AH Transform Values */
|
|
|
|
#define IPSECDOI_AH_MD5 2
|
|
|
|
#define IPSECDOI_AH_SHA 3
|
|
|
|
#define IPSECDOI_AH_DES 4
|
|
|
|
#define IPSECDOI_AH_SHA2_256 5
|
|
|
|
#define IPSECDOI_AH_SHA2_384 6
|
|
|
|
#define IPSECDOI_AH_SHA2_512 7
|
|
|
|
|
|
|
|
/* 4.4.1 IPSEC Security Protocol Identifiers */
|
|
|
|
#define IPSECDOI_PROTO_IPSEC_ESP 3
|
|
|
|
/* 4.4.4 IPSEC ESP Transform Identifiers */
|
|
|
|
#define IPSECDOI_ESP_DES_IV64 1
|
|
|
|
#define IPSECDOI_ESP_DES 2
|
|
|
|
#define IPSECDOI_ESP_3DES 3
|
|
|
|
#define IPSECDOI_ESP_RC5 4
|
|
|
|
#define IPSECDOI_ESP_IDEA 5
|
|
|
|
#define IPSECDOI_ESP_CAST 6
|
|
|
|
#define IPSECDOI_ESP_BLOWFISH 7
|
|
|
|
#define IPSECDOI_ESP_3IDEA 8
|
|
|
|
#define IPSECDOI_ESP_DES_IV32 9
|
|
|
|
#define IPSECDOI_ESP_RC4 10
|
|
|
|
#define IPSECDOI_ESP_NULL 11
|
|
|
|
#define IPSECDOI_ESP_RIJNDAEL 12
|
|
|
|
#define IPSECDOI_ESP_AES 12
|
|
|
|
|
|
|
|
/* 4.4.1 IPSEC Security Protocol Identifiers */
|
|
|
|
#define IPSECDOI_PROTO_IPCOMP 4
|
|
|
|
/* 4.4.5 IPSEC IPCOMP Transform Identifiers */
|
|
|
|
#define IPSECDOI_IPCOMP_OUI 1
|
|
|
|
#define IPSECDOI_IPCOMP_DEFLATE 2
|
|
|
|
#define IPSECDOI_IPCOMP_LZS 3
|
|
|
|
|
|
|
|
/* 4.5 IPSEC Security Association Attributes */
|
|
|
|
#define IPSECDOI_ATTR_SA_LTYPE 1 /* B */
|
|
|
|
#define IPSECDOI_ATTR_SA_LTYPE_DEFAULT 1
|
|
|
|
#define IPSECDOI_ATTR_SA_LTYPE_SEC 1
|
|
|
|
#define IPSECDOI_ATTR_SA_LTYPE_KB 2
|
|
|
|
#define IPSECDOI_ATTR_SA_LDUR 2 /* V */
|
|
|
|
#define IPSECDOI_ATTR_SA_LDUR_DEFAULT 28800 /* 8 hours */
|
|
|
|
#define IPSECDOI_ATTR_GRP_DESC 3 /* B */
|
|
|
|
#define IPSECDOI_ATTR_ENC_MODE 4 /* B */
|
|
|
|
/* default value: host dependent */
|
|
|
|
#define IPSECDOI_ATTR_ENC_MODE_TUNNEL 1
|
|
|
|
#define IPSECDOI_ATTR_ENC_MODE_TRNS 2
|
|
|
|
#define IPSECDOI_ATTR_AUTH 5 /* B */
|
|
|
|
/* 0 means not to use authentication. */
|
|
|
|
#define IPSECDOI_ATTR_AUTH_HMAC_MD5 1
|
|
|
|
#define IPSECDOI_ATTR_AUTH_HMAC_SHA1 2
|
|
|
|
#define IPSECDOI_ATTR_AUTH_DES_MAC 3
|
|
|
|
#define IPSECDOI_ATTR_AUTH_KPDK 4 /*RFC-1826(Key/Pad/Data/Key)*/
|
|
|
|
/*
|
|
|
|
* When negotiating ESP without authentication, the Auth
|
|
|
|
* Algorithm attribute MUST NOT be included in the proposal.
|
|
|
|
* When negotiating ESP without confidentiality, the Auth
|
|
|
|
* Algorithm attribute MUST be included in the proposal and
|
|
|
|
* the ESP transform ID must be ESP_NULL.
|
|
|
|
*/
|
|
|
|
#define IPSECDOI_ATTR_KEY_LENGTH 6 /* B */
|
|
|
|
#define IPSECDOI_ATTR_KEY_ROUNDS 7 /* B */
|
|
|
|
#define IPSECDOI_ATTR_COMP_DICT_SIZE 8 /* B */
|
|
|
|
#define IPSECDOI_ATTR_COMP_PRIVALG 9 /* V */
|
|
|
|
|
|
|
|
/* 4.6.1 Security Association Payload */
|
|
|
|
struct ipsecdoi_sa {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi; /* Domain of Interpretation */
|
|
|
|
uint32_t sit; /* Situation */
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
struct ipsecdoi_secrecy_h {
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t len;
|
|
|
|
uint16_t reserved;
|
2013-12-31 14:52:15 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* 4.6.2.1 Identification Type Values */
|
|
|
|
struct ipsecdoi_id {
|
|
|
|
struct isakmp_gen h;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint8_t type; /* ID Type */
|
|
|
|
uint8_t proto_id; /* Protocol ID */
|
|
|
|
uint16_t port; /* Port */
|
2013-12-31 14:52:15 +08:00
|
|
|
/* Identification Data */
|
|
|
|
};
|
|
|
|
|
|
|
|
#define IPSECDOI_ID_IPV4_ADDR 1
|
|
|
|
#define IPSECDOI_ID_FQDN 2
|
|
|
|
#define IPSECDOI_ID_USER_FQDN 3
|
|
|
|
#define IPSECDOI_ID_IPV4_ADDR_SUBNET 4
|
|
|
|
#define IPSECDOI_ID_IPV6_ADDR 5
|
|
|
|
#define IPSECDOI_ID_IPV6_ADDR_SUBNET 6
|
|
|
|
#define IPSECDOI_ID_IPV4_ADDR_RANGE 7
|
|
|
|
#define IPSECDOI_ID_IPV6_ADDR_RANGE 8
|
|
|
|
#define IPSECDOI_ID_DER_ASN1_DN 9
|
|
|
|
#define IPSECDOI_ID_DER_ASN1_GN 10
|
|
|
|
#define IPSECDOI_ID_KEY_ID 11
|
|
|
|
|
|
|
|
/* 4.6.3 IPSEC DOI Notify Message Types */
|
|
|
|
/* Notify Messages - Status Types */
|
|
|
|
#define IPSECDOI_NTYPE_RESPONDER_LIFETIME 24576
|
|
|
|
#define IPSECDOI_NTYPE_REPLAY_STATUS 24577
|
|
|
|
#define IPSECDOI_NTYPE_INITIAL_CONTACT 24578
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
#define DECLARE_PRINTER(func) static const u_char *ike##func##_print( \
|
|
|
|
netdissect_options *ndo, u_char tpay, \
|
|
|
|
const struct isakmp_gen *ext, \
|
|
|
|
u_int item_len, \
|
|
|
|
const u_char *end_pointer, \
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase,\
|
|
|
|
uint32_t doi0, \
|
|
|
|
uint32_t proto0, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
DECLARE_PRINTER(v1_sa);
|
|
|
|
DECLARE_PRINTER(v1_p);
|
|
|
|
DECLARE_PRINTER(v1_t);
|
|
|
|
DECLARE_PRINTER(v1_ke);
|
|
|
|
DECLARE_PRINTER(v1_id);
|
|
|
|
DECLARE_PRINTER(v1_cert);
|
|
|
|
DECLARE_PRINTER(v1_cr);
|
|
|
|
DECLARE_PRINTER(v1_sig);
|
|
|
|
DECLARE_PRINTER(v1_hash);
|
|
|
|
DECLARE_PRINTER(v1_nonce);
|
|
|
|
DECLARE_PRINTER(v1_n);
|
|
|
|
DECLARE_PRINTER(v1_d);
|
|
|
|
DECLARE_PRINTER(v1_vid);
|
|
|
|
|
|
|
|
DECLARE_PRINTER(v2_sa);
|
|
|
|
DECLARE_PRINTER(v2_ke);
|
|
|
|
DECLARE_PRINTER(v2_ID);
|
|
|
|
DECLARE_PRINTER(v2_cert);
|
|
|
|
DECLARE_PRINTER(v2_cr);
|
|
|
|
DECLARE_PRINTER(v2_auth);
|
|
|
|
DECLARE_PRINTER(v2_nonce);
|
|
|
|
DECLARE_PRINTER(v2_n);
|
|
|
|
DECLARE_PRINTER(v2_d);
|
|
|
|
DECLARE_PRINTER(v2_vid);
|
|
|
|
DECLARE_PRINTER(v2_TS);
|
|
|
|
DECLARE_PRINTER(v2_cp);
|
|
|
|
DECLARE_PRINTER(v2_eap);
|
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
static const u_char *ikev2_e_print(netdissect_options *ndo,
|
|
|
|
struct isakmp *base,
|
|
|
|
u_char tpay,
|
|
|
|
const struct isakmp_gen *ext,
|
2014-01-02 10:27:54 +08:00
|
|
|
u_int item_len,
|
|
|
|
const u_char *end_pointer,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase,
|
|
|
|
uint32_t doi0,
|
|
|
|
uint32_t proto0, int depth);
|
2007-11-25 02:13:33 +08:00
|
|
|
|
|
|
|
|
2007-08-29 10:58:43 +08:00
|
|
|
static const u_char *ike_sub0_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *, uint32_t, uint32_t, uint32_t, int);
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *ikev1_sub_print(netdissect_options *ndo,u_char, const struct isakmp_gen *,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *, uint32_t, uint32_t, uint32_t, int);
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
static const u_char *ikev2_sub_print(netdissect_options *ndo,
|
2007-11-25 02:13:33 +08:00
|
|
|
struct isakmp *base,
|
2007-08-29 10:38:14 +08:00
|
|
|
u_char np, const struct isakmp_gen *ext,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep, uint32_t phase,
|
|
|
|
uint32_t doi, uint32_t proto,
|
2007-08-29 10:38:14 +08:00
|
|
|
int depth);
|
|
|
|
|
|
|
|
|
2000-09-24 15:50:35 +08:00
|
|
|
static char *numstr(int);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static void
|
|
|
|
ikev1_print(netdissect_options *ndo,
|
|
|
|
const u_char *bp, u_int length,
|
|
|
|
const u_char *bp2, struct isakmp *base);
|
|
|
|
|
1999-10-30 13:11:06 +08:00
|
|
|
#define MAXINITIATORS 20
|
2016-09-12 03:45:26 +08:00
|
|
|
static int ninitiator = 0;
|
2014-01-17 03:59:17 +08:00
|
|
|
union inaddr_u {
|
|
|
|
struct in_addr in4;
|
|
|
|
struct in6_addr in6;
|
|
|
|
};
|
2016-09-12 03:45:26 +08:00
|
|
|
static struct {
|
1999-10-30 13:11:06 +08:00
|
|
|
cookie_t initiator;
|
2014-01-17 03:59:17 +08:00
|
|
|
u_int version;
|
|
|
|
union inaddr_u iaddr;
|
|
|
|
union inaddr_u raddr;
|
1999-10-30 13:11:06 +08:00
|
|
|
} cookiecache[MAXINITIATORS];
|
|
|
|
|
|
|
|
/* protocol id */
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *protoidstr[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL, "isakmp", "ipsec-ah", "ipsec-esp", "ipcomp",
|
|
|
|
};
|
|
|
|
|
|
|
|
/* isakmp->np */
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *npstr[] = {
|
2007-08-29 10:38:14 +08:00
|
|
|
"none", "sa", "p", "t", "ke", "id", "cert", "cr", "hash", /* 0 - 8 */
|
|
|
|
"sig", "nonce", "n", "d", "vid", /* 9 - 13 */
|
|
|
|
"pay14", "pay15", "pay16", "pay17", "pay18", /* 14- 18 */
|
|
|
|
"pay19", "pay20", "pay21", "pay22", "pay23", /* 19- 23 */
|
|
|
|
"pay24", "pay25", "pay26", "pay27", "pay28", /* 24- 28 */
|
|
|
|
"pay29", "pay30", "pay31", "pay32", /* 29- 32 */
|
|
|
|
"v2sa", "v2ke", "v2IDi", "v2IDr", "v2cert",/* 33- 37 */
|
|
|
|
"v2cr", "v2auth","v2nonce", "v2n", "v2d", /* 38- 42 */
|
|
|
|
"v2vid", "v2TSi", "v2TSr", "v2e", "v2cp", /* 43- 47 */
|
|
|
|
"v2eap", /* 48 */
|
2014-01-02 10:27:54 +08:00
|
|
|
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* isakmp->np */
|
2014-01-02 10:27:54 +08:00
|
|
|
static const u_char *(*npfunc[])(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len,
|
|
|
|
const u_char *end_pointer,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase,
|
|
|
|
uint32_t doi0,
|
|
|
|
uint32_t proto0, int depth) = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL,
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev1_sa_print,
|
|
|
|
ikev1_p_print,
|
|
|
|
ikev1_t_print,
|
|
|
|
ikev1_ke_print,
|
|
|
|
ikev1_id_print,
|
|
|
|
ikev1_cert_print,
|
|
|
|
ikev1_cr_print,
|
|
|
|
ikev1_hash_print,
|
|
|
|
ikev1_sig_print,
|
|
|
|
ikev1_nonce_print,
|
|
|
|
ikev1_n_print,
|
|
|
|
ikev1_d_print,
|
|
|
|
ikev1_vid_print, /* 13 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, /* 14- 18 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, /* 19- 23 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, /* 24- 28 */
|
|
|
|
NULL, NULL, NULL, NULL, /* 29- 32 */
|
|
|
|
ikev2_sa_print, /* 33 */
|
|
|
|
ikev2_ke_print, /* 34 */
|
|
|
|
ikev2_ID_print, /* 35 */
|
|
|
|
ikev2_ID_print, /* 36 */
|
|
|
|
ikev2_cert_print, /* 37 */
|
|
|
|
ikev2_cr_print, /* 38 */
|
|
|
|
ikev2_auth_print, /* 39 */
|
|
|
|
ikev2_nonce_print, /* 40 */
|
|
|
|
ikev2_n_print, /* 41 */
|
|
|
|
ikev2_d_print, /* 42 */
|
|
|
|
ikev2_vid_print, /* 43 */
|
|
|
|
ikev2_TS_print, /* 44 */
|
|
|
|
ikev2_TS_print, /* 45 */
|
2007-11-25 02:13:33 +08:00
|
|
|
NULL, /* ikev2_e_print,*/ /* 46 - special */
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_cp_print, /* 47 */
|
|
|
|
ikev2_eap_print, /* 48 */
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/* isakmp->etype */
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *etypestr[] = {
|
2007-08-29 10:38:14 +08:00
|
|
|
/* IKEv1 exchange types */
|
|
|
|
"none", "base", "ident", "auth", "agg", "inf", NULL, NULL, /* 0-7 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 8-15 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 16-23 */
|
|
|
|
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* 24-31 */
|
|
|
|
"oakley-quick", "oakley-newgroup", /* 32-33 */
|
|
|
|
/* IKEv2 exchange types */
|
|
|
|
"ikev2_init", "ikev2_auth", "child_sa", "inf2" /* 34-37 */
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
#define STR_OR_ID(x, tab) \
|
|
|
|
(((x) < sizeof(tab)/sizeof(tab[0]) && tab[(x)]) ? tab[(x)] : numstr(x))
|
|
|
|
#define PROTOIDSTR(x) STR_OR_ID(x, protoidstr)
|
|
|
|
#define NPSTR(x) STR_OR_ID(x, npstr)
|
|
|
|
#define ETYPESTR(x) STR_OR_ID(x, etypestr)
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
#define CHECKLEN(p, np) \
|
2015-04-27 08:24:42 +08:00
|
|
|
if (ep < (const u_char *)(p)) { \
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(np))); \
|
|
|
|
goto done; \
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
|
1999-10-30 13:11:06 +08:00
|
|
|
#define NPFUNC(x) \
|
|
|
|
(((x) < sizeof(npfunc)/sizeof(npfunc[0]) && npfunc[(x)]) \
|
|
|
|
? npfunc[(x)] : NULL)
|
|
|
|
|
|
|
|
static int
|
2015-04-27 08:24:42 +08:00
|
|
|
iszero(const u_char *p, size_t l)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
|
|
|
while (l--) {
|
|
|
|
if (*p++)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* find cookie from initiator cache */
|
|
|
|
static int
|
|
|
|
cookie_find(cookie_t *in)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < MAXINITIATORS; i++) {
|
|
|
|
if (memcmp(in, &cookiecache[i].initiator, sizeof(*in)) == 0)
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* record initiator */
|
|
|
|
static void
|
|
|
|
cookie_record(cookie_t *in, const u_char *bp2)
|
|
|
|
{
|
|
|
|
int i;
|
2015-04-27 08:24:42 +08:00
|
|
|
const struct ip *ip;
|
|
|
|
const struct ip6_hdr *ip6;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
|
|
|
i = cookie_find(in);
|
|
|
|
if (0 <= i) {
|
|
|
|
ninitiator = (i + 1) % MAXINITIATORS;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
ip = (const struct ip *)bp2;
|
2000-10-03 10:54:54 +08:00
|
|
|
switch (IP_V(ip)) {
|
1999-10-30 13:11:06 +08:00
|
|
|
case 4:
|
2014-01-17 03:59:17 +08:00
|
|
|
cookiecache[ninitiator].version = 4;
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in4, &ip->ip_src, sizeof(struct in_addr));
|
|
|
|
UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in4, &ip->ip_dst, sizeof(struct in_addr));
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
case 6:
|
2015-04-27 08:24:42 +08:00
|
|
|
ip6 = (const struct ip6_hdr *)bp2;
|
2014-01-17 03:59:17 +08:00
|
|
|
cookiecache[ninitiator].version = 6;
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6, &ip6->ip6_src, sizeof(struct in6_addr));
|
|
|
|
UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6, &ip6->ip6_dst, sizeof(struct in6_addr));
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&cookiecache[ninitiator].initiator, in, sizeof(*in));
|
1999-10-30 13:11:06 +08:00
|
|
|
ninitiator = (ninitiator + 1) % MAXINITIATORS;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define cookie_isinitiator(x, y) cookie_sidecheck((x), (y), 1)
|
|
|
|
#define cookie_isresponder(x, y) cookie_sidecheck((x), (y), 0)
|
|
|
|
static int
|
|
|
|
cookie_sidecheck(int i, const u_char *bp2, int initiator)
|
|
|
|
{
|
2015-04-27 08:24:42 +08:00
|
|
|
const struct ip *ip;
|
|
|
|
const struct ip6_hdr *ip6;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
ip = (const struct ip *)bp2;
|
2000-10-03 10:54:54 +08:00
|
|
|
switch (IP_V(ip)) {
|
1999-10-30 13:11:06 +08:00
|
|
|
case 4:
|
2014-01-17 03:59:17 +08:00
|
|
|
if (cookiecache[i].version != 4)
|
|
|
|
return 0;
|
|
|
|
if (initiator) {
|
2014-01-18 09:51:04 +08:00
|
|
|
if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].iaddr.in4, sizeof(struct in_addr)) == 0)
|
2014-01-17 03:59:17 +08:00
|
|
|
return 1;
|
|
|
|
} else {
|
2014-01-18 09:51:04 +08:00
|
|
|
if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].raddr.in4, sizeof(struct in_addr)) == 0)
|
2014-01-17 03:59:17 +08:00
|
|
|
return 1;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
case 6:
|
2014-01-17 03:59:17 +08:00
|
|
|
if (cookiecache[i].version != 6)
|
|
|
|
return 0;
|
2015-04-27 08:24:42 +08:00
|
|
|
ip6 = (const struct ip6_hdr *)bp2;
|
2014-01-17 03:59:17 +08:00
|
|
|
if (initiator) {
|
2014-01-18 09:51:04 +08:00
|
|
|
if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(struct in6_addr)) == 0)
|
2014-01-17 03:59:17 +08:00
|
|
|
return 1;
|
|
|
|
} else {
|
2014-01-18 09:51:04 +08:00
|
|
|
if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].raddr.in6, sizeof(struct in6_addr)) == 0)
|
2014-01-17 03:59:17 +08:00
|
|
|
return 1;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
default:
|
2014-01-17 03:59:17 +08:00
|
|
|
break;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
static void
|
2015-04-27 08:24:42 +08:00
|
|
|
hexprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2015-04-27 08:24:42 +08:00
|
|
|
const uint8_t *p;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
size_t i;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = loc;
|
1999-10-30 13:11:06 +08:00
|
|
|
for (i = 0; i < len; i++)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%02x", p[i] & 0xff));
|
2007-11-25 02:13:33 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2015-04-27 08:24:42 +08:00
|
|
|
rawprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
|
2007-11-25 02:13:33 +08:00
|
|
|
{
|
|
|
|
ND_TCHECK2(*loc, len);
|
|
|
|
|
|
|
|
hexprint(ndo, loc, len);
|
2007-08-29 10:38:14 +08:00
|
|
|
return 1;
|
|
|
|
trunc:
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
/*
|
|
|
|
* returns false if we run out of data buffer
|
|
|
|
*/
|
2014-04-04 15:43:46 +08:00
|
|
|
static int ike_show_somedata(netdissect_options *ndo,
|
2007-08-29 10:38:14 +08:00
|
|
|
const u_char *cp, const u_char *ep)
|
|
|
|
{
|
|
|
|
/* there is too much data, just show some of it */
|
|
|
|
const u_char *end = ep - 20;
|
|
|
|
int elen = 20;
|
|
|
|
int len = ep - cp;
|
|
|
|
if(len > 10) {
|
|
|
|
len = 10;
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
/* really shouldn't happen because of above */
|
|
|
|
if(end < cp + len) {
|
|
|
|
end = cp+len;
|
|
|
|
elen = ep - end;
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," data=("));
|
2015-04-27 08:24:42 +08:00
|
|
|
if(!rawprint(ndo, (const uint8_t *)(cp), len)) goto trunc;
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo, "..."));
|
|
|
|
if(elen) {
|
2015-04-27 08:24:42 +08:00
|
|
|
if(!rawprint(ndo, (const uint8_t *)(end), elen)) goto trunc;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
ND_PRINT((ndo,")"));
|
2004-03-12 10:17:18 +08:00
|
|
|
return 1;
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2004-01-07 16:00:51 +08:00
|
|
|
trunc:
|
2004-03-12 10:17:18 +08:00
|
|
|
return 0;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
struct attrmap {
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
const char *type;
|
|
|
|
u_int nvalue;
|
|
|
|
const char *value[30]; /*XXX*/
|
1999-10-18 05:59:12 +08:00
|
|
|
};
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev1_attrmap_print(netdissect_options *ndo,
|
2017-06-12 12:06:55 +08:00
|
|
|
const u_char *p, const u_char *ep2,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct attrmap *map, size_t nmap)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
|
|
|
int totlen;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t t, v;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2017-12-04 01:18:58 +08:00
|
|
|
ND_TCHECK_1(p);
|
2017-12-04 04:12:03 +08:00
|
|
|
if (EXTRACT_U_1(p) & 0x80)
|
1999-10-30 13:11:06 +08:00
|
|
|
totlen = 4;
|
2017-06-12 12:06:55 +08:00
|
|
|
else {
|
2017-11-23 19:23:32 +08:00
|
|
|
ND_TCHECK_2(p + 2);
|
2017-11-23 06:54:09 +08:00
|
|
|
totlen = 4 + EXTRACT_BE_U_2(p + 2);
|
2017-06-12 12:06:55 +08:00
|
|
|
}
|
|
|
|
if (ep2 < p + totlen) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"[|attr]"));
|
2017-06-12 12:06:55 +08:00
|
|
|
return ep2 + 1;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2017-11-23 19:23:32 +08:00
|
|
|
ND_TCHECK_2(p);
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"("));
|
2017-11-23 06:54:09 +08:00
|
|
|
t = EXTRACT_BE_U_2(p) & 0x7fff;
|
1999-10-30 13:11:06 +08:00
|
|
|
if (map && t < nmap && map[t].type)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"type=%s ", map[t].type));
|
1999-10-30 13:11:06 +08:00
|
|
|
else
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"type=#%d ", t));
|
2017-12-04 04:12:03 +08:00
|
|
|
if (EXTRACT_U_1(p) & 0x80) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"value="));
|
2017-11-23 19:23:32 +08:00
|
|
|
ND_TCHECK_2(p + 2);
|
2017-11-23 06:54:09 +08:00
|
|
|
v = EXTRACT_BE_U_2(p + 2);
|
1999-10-30 13:11:06 +08:00
|
|
|
if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s", map[t].value[v]));
|
2017-06-12 12:06:55 +08:00
|
|
|
else {
|
2017-12-03 18:13:27 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
} else {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,"len=%d value=", totlen - 4));
|
2017-12-03 18:13:27 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
1999-10-30 13:11:06 +08:00
|
|
|
return p + totlen;
|
2017-06-12 12:06:55 +08:00
|
|
|
|
|
|
|
trunc:
|
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2017-06-12 12:06:55 +08:00
|
|
|
ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
|
|
|
int totlen;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t t;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2017-12-04 01:18:58 +08:00
|
|
|
ND_TCHECK_1(p);
|
2017-12-04 04:12:03 +08:00
|
|
|
if (EXTRACT_U_1(p) & 0x80)
|
1999-10-30 13:11:06 +08:00
|
|
|
totlen = 4;
|
2017-06-12 12:06:55 +08:00
|
|
|
else {
|
2017-11-23 19:23:32 +08:00
|
|
|
ND_TCHECK_2(p + 2);
|
2017-11-23 06:54:09 +08:00
|
|
|
totlen = 4 + EXTRACT_BE_U_2(p + 2);
|
2017-06-12 12:06:55 +08:00
|
|
|
}
|
|
|
|
if (ep2 < p + totlen) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"[|attr]"));
|
2017-06-12 12:06:55 +08:00
|
|
|
return ep2 + 1;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2017-11-23 19:23:32 +08:00
|
|
|
ND_TCHECK_2(p);
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"("));
|
2017-11-23 06:54:09 +08:00
|
|
|
t = EXTRACT_BE_U_2(p) & 0x7fff;
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"type=#%d ", t));
|
2017-12-04 04:12:03 +08:00
|
|
|
if (EXTRACT_U_1(p) & 0x80) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"value="));
|
2017-12-09 19:32:00 +08:00
|
|
|
t = EXTRACT_U_1(p + 2);
|
2017-12-03 18:13:27 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
} else {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,"len=%d value=", totlen - 4));
|
2017-12-03 18:13:27 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {
|
2017-06-12 12:06:55 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
1999-10-30 13:11:06 +08:00
|
|
|
return p + totlen;
|
2017-06-12 12:06:55 +08:00
|
|
|
|
|
|
|
trunc:
|
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
2004-03-25 11:30:55 +08:00
|
|
|
u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep, uint32_t phase, uint32_t doi0 _U_,
|
|
|
|
uint32_t proto0, int depth)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_sa *p;
|
|
|
|
struct ikev1_pl_sa sa;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi, sit, ident;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *cp, *np;
|
1999-10-30 13:11:06 +08:00
|
|
|
int t;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_sa *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&sa, ext, sizeof(sa));
|
2000-10-03 13:16:38 +08:00
|
|
|
doi = ntohl(sa.doi);
|
2000-12-12 17:20:26 +08:00
|
|
|
sit = ntohl(sa.sit);
|
1999-10-30 13:11:06 +08:00
|
|
|
if (doi != 1) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=%d", doi));
|
2014-04-23 15:20:40 +08:00
|
|
|
ND_PRINT((ndo," situation=%u", (uint32_t)ntohl(sa.sit)));
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)(p + 1);
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=ipsec"));
|
|
|
|
ND_PRINT((ndo," situation="));
|
1999-10-30 13:11:06 +08:00
|
|
|
t = 0;
|
2000-12-12 17:20:26 +08:00
|
|
|
if (sit & 0x01) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"identity"));
|
1999-10-30 13:11:06 +08:00
|
|
|
t++;
|
|
|
|
}
|
2000-12-12 17:20:26 +08:00
|
|
|
if (sit & 0x02) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%ssecrecy", t ? "+" : ""));
|
1999-10-30 13:11:06 +08:00
|
|
|
t++;
|
|
|
|
}
|
2000-12-12 17:20:26 +08:00
|
|
|
if (sit & 0x04)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%sintegrity", t ? "+" : ""));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
np = (const u_char *)ext + sizeof(sa);
|
2000-12-12 17:20:26 +08:00
|
|
|
if (sit != 0x01) {
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK2(*(ext + 1), sizeof(ident));
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));
|
2014-04-23 15:20:40 +08:00
|
|
|
ND_PRINT((ndo," ident=%u", (uint32_t)ntohl(ident)));
|
2000-12-12 17:20:26 +08:00
|
|
|
np += sizeof(ident);
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)np;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,
|
2002-09-05 08:43:21 +08:00
|
|
|
depth);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
|
|
|
return cp;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SA)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_p_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep, uint32_t phase, uint32_t doi0,
|
|
|
|
uint32_t proto0 _U_, int depth)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_p *p;
|
|
|
|
struct ikev1_pl_p prop;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *cp;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_P)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_p *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," #%d protoid=%s transform=%d",
|
|
|
|
prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t));
|
2000-10-03 13:16:38 +08:00
|
|
|
if (prop.spi_size) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," spi="));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 1), prop.spi_size))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + prop.spi_size);
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
|
|
|
|
prop.prot_id, depth);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
1999-10-30 13:11:06 +08:00
|
|
|
return cp;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const char *ikev1_p_map[] = {
|
|
|
|
NULL, "ike",
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *ikev2_t_type_map[]={
|
|
|
|
NULL, "encr", "prf", "integ", "dh", "esn"
|
|
|
|
};
|
|
|
|
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *ah_p_map[] = {
|
2000-04-24 20:49:11 +08:00
|
|
|
NULL, "(reserved)", "md5", "sha", "1des",
|
2000-10-04 10:54:40 +08:00
|
|
|
"sha2-256", "sha2-384", "sha2-512",
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const char *prf_p_map[] = {
|
|
|
|
NULL, "hmac-md5", "hmac-sha", "hmac-tiger",
|
|
|
|
"aes128_xcbc"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *integ_p_map[] = {
|
|
|
|
NULL, "hmac-md5", "hmac-sha", "dec-mac",
|
|
|
|
"kpdk-md5", "aes-xcbc"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *esn_p_map[] = {
|
|
|
|
"no-esn", "esn"
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char *dh_p_map[] = {
|
|
|
|
NULL, "modp768",
|
|
|
|
"modp1024", /* group 2 */
|
|
|
|
"EC2N 2^155", /* group 3 */
|
|
|
|
"EC2N 2^185", /* group 4 */
|
|
|
|
"modp1536", /* group 5 */
|
|
|
|
"iana-grp06", "iana-grp07", /* reserved */
|
|
|
|
"iana-grp08", "iana-grp09",
|
|
|
|
"iana-grp10", "iana-grp11",
|
|
|
|
"iana-grp12", "iana-grp13",
|
|
|
|
"modp2048", /* group 14 */
|
|
|
|
"modp3072", /* group 15 */
|
|
|
|
"modp4096", /* group 16 */
|
|
|
|
"modp6144", /* group 17 */
|
|
|
|
"modp8192", /* group 18 */
|
|
|
|
};
|
|
|
|
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *esp_p_map[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL, "1des-iv64", "1des", "3des", "rc5", "idea", "cast",
|
2000-10-04 10:54:40 +08:00
|
|
|
"blowfish", "3idea", "1des-iv32", "rc4", "null", "aes"
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *ipcomp_p_map[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL, "oui", "deflate", "lzs",
|
|
|
|
};
|
|
|
|
|
2013-12-19 18:05:59 +08:00
|
|
|
static const struct attrmap ipsec_t_map[] = {
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ NULL, 0, { NULL } },
|
1999-10-30 13:11:06 +08:00
|
|
|
{ "lifetype", 3, { NULL, "sec", "kb", }, },
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ "life", 0, { NULL } },
|
2006-08-28 02:48:29 +08:00
|
|
|
{ "group desc", 18, { NULL, "modp768",
|
2006-08-28 02:46:39 +08:00
|
|
|
"modp1024", /* group 2 */
|
|
|
|
"EC2N 2^155", /* group 3 */
|
|
|
|
"EC2N 2^185", /* group 4 */
|
|
|
|
"modp1536", /* group 5 */
|
|
|
|
"iana-grp06", "iana-grp07", /* reserved */
|
|
|
|
"iana-grp08", "iana-grp09",
|
|
|
|
"iana-grp10", "iana-grp11",
|
|
|
|
"iana-grp12", "iana-grp13",
|
|
|
|
"modp2048", /* group 14 */
|
|
|
|
"modp3072", /* group 15 */
|
|
|
|
"modp4096", /* group 16 */
|
|
|
|
"modp6144", /* group 17 */
|
|
|
|
"modp8192", /* group 18 */
|
|
|
|
}, },
|
1999-10-30 13:11:06 +08:00
|
|
|
{ "enc mode", 3, { NULL, "tunnel", "transport", }, },
|
|
|
|
{ "auth", 5, { NULL, "hmac-md5", "hmac-sha1", "1des-mac", "keyed", }, },
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ "keylen", 0, { NULL } },
|
|
|
|
{ "rounds", 0, { NULL } },
|
|
|
|
{ "dictsize", 0, { NULL } },
|
|
|
|
{ "privalg", 0, { NULL } },
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
2013-12-19 18:05:59 +08:00
|
|
|
static const struct attrmap encr_t_map[] = {
|
2007-08-29 10:38:14 +08:00
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 0, 1 */
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 2, 3 */
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 4, 5 */
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 6, 7 */
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 8, 9 */
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 10,11*/
|
|
|
|
{ NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 12,13*/
|
|
|
|
{ "keylen", 14, { NULL }},
|
|
|
|
};
|
|
|
|
|
2013-12-19 18:05:59 +08:00
|
|
|
static const struct attrmap oakley_t_map[] = {
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ NULL, 0, { NULL } },
|
2000-10-04 10:54:40 +08:00
|
|
|
{ "enc", 8, { NULL, "1des", "idea", "blowfish", "rc5",
|
|
|
|
"3des", "cast", "aes", }, },
|
|
|
|
{ "hash", 7, { NULL, "md5", "sha1", "tiger",
|
|
|
|
"sha2-256", "sha2-384", "sha2-512", }, },
|
1999-10-30 13:11:06 +08:00
|
|
|
{ "auth", 6, { NULL, "preshared", "dss", "rsa sig", "rsa enc",
|
|
|
|
"rsa enc revised", }, },
|
2006-08-28 02:48:29 +08:00
|
|
|
{ "group desc", 18, { NULL, "modp768",
|
2006-08-28 02:46:39 +08:00
|
|
|
"modp1024", /* group 2 */
|
|
|
|
"EC2N 2^155", /* group 3 */
|
|
|
|
"EC2N 2^185", /* group 4 */
|
|
|
|
"modp1536", /* group 5 */
|
|
|
|
"iana-grp06", "iana-grp07", /* reserved */
|
|
|
|
"iana-grp08", "iana-grp09",
|
|
|
|
"iana-grp10", "iana-grp11",
|
|
|
|
"iana-grp12", "iana-grp13",
|
|
|
|
"modp2048", /* group 14 */
|
|
|
|
"modp3072", /* group 15 */
|
|
|
|
"modp4096", /* group 16 */
|
|
|
|
"modp6144", /* group 17 */
|
|
|
|
"modp8192", /* group 18 */
|
|
|
|
}, },
|
1999-10-30 13:11:06 +08:00
|
|
|
{ "group type", 4, { NULL, "MODP", "ECP", "EC2N", }, },
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ "group prime", 0, { NULL } },
|
|
|
|
{ "group gen1", 0, { NULL } },
|
|
|
|
{ "group gen2", 0, { NULL } },
|
|
|
|
{ "group curve A", 0, { NULL } },
|
|
|
|
{ "group curve B", 0, { NULL } },
|
1999-10-30 13:11:06 +08:00
|
|
|
{ "lifetype", 3, { NULL, "sec", "kb", }, },
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
{ "lifeduration", 0, { NULL } },
|
|
|
|
{ "prf", 0, { NULL } },
|
|
|
|
{ "keylen", 0, { NULL } },
|
|
|
|
{ "field", 0, { NULL } },
|
|
|
|
{ "order", 0, { NULL } },
|
1999-10-30 13:11:06 +08:00
|
|
|
};
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_t_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep, uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_t *p;
|
|
|
|
struct ikev1_pl_t t;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *cp;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
const char *idstr;
|
2002-09-05 08:43:21 +08:00
|
|
|
const struct attrmap *map;
|
1999-10-30 13:11:06 +08:00
|
|
|
size_t nmap;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *ep2;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_T)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_t *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&t, ext, sizeof(t));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
|
|
|
switch (proto) {
|
|
|
|
case 1:
|
2007-08-29 10:38:14 +08:00
|
|
|
idstr = STR_OR_ID(t.t_id, ikev1_p_map);
|
1999-10-30 13:11:06 +08:00
|
|
|
map = oakley_t_map;
|
|
|
|
nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
|
|
|
|
break;
|
|
|
|
case 2:
|
2000-10-03 13:16:38 +08:00
|
|
|
idstr = STR_OR_ID(t.t_id, ah_p_map);
|
1999-10-30 13:11:06 +08:00
|
|
|
map = ipsec_t_map;
|
|
|
|
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
|
|
|
|
break;
|
|
|
|
case 3:
|
2000-10-03 13:16:38 +08:00
|
|
|
idstr = STR_OR_ID(t.t_id, esp_p_map);
|
1999-10-30 13:11:06 +08:00
|
|
|
map = ipsec_t_map;
|
|
|
|
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
|
|
|
|
break;
|
|
|
|
case 4:
|
2000-10-03 13:16:38 +08:00
|
|
|
idstr = STR_OR_ID(t.t_id, ipcomp_p_map);
|
1999-10-30 13:11:06 +08:00
|
|
|
map = ipsec_t_map;
|
|
|
|
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
idstr = NULL;
|
|
|
|
map = NULL;
|
|
|
|
nmap = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (idstr)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," #%d id=%s ", t.t_no, idstr));
|
1999-10-30 13:11:06 +08:00
|
|
|
else
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," #%d id=%d ", t.t_no, t.t_id));
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)(p + 1);
|
|
|
|
ep2 = (const u_char *)p + item_len;
|
1999-10-30 13:11:06 +08:00
|
|
|
while (cp < ep && cp < ep2) {
|
2017-06-12 12:06:55 +08:00
|
|
|
if (map && nmap)
|
|
|
|
cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap);
|
|
|
|
else
|
|
|
|
cp = ikev1_attr_print(ndo, cp, ep2);
|
|
|
|
if (cp == NULL)
|
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
if (ep < ep2)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"..."));
|
1999-10-30 13:11:06 +08:00
|
|
|
return cp;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_T)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_ke_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_KE)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," key len=%d", ntohs(e.len) - 4));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_KE)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_id_print(netdissect_options *ndo, u_char tpay _U_,
|
2014-04-19 08:53:01 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
|
|
|
#define USE_IPSECDOI_IN_PHASE1 1
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_id *p;
|
|
|
|
struct ikev1_pl_id id;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *idtypestr[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
"IPv4", "IPv4net", "IPv6", "IPv6net",
|
|
|
|
};
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *ipsecidtypestr[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL, "IPv4", "FQDN", "user FQDN", "IPv4net", "IPv6",
|
|
|
|
"IPv6net", "IPv4range", "IPv6range", "ASN1 DN", "ASN1 GN",
|
|
|
|
"keyid",
|
|
|
|
};
|
|
|
|
int len;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *data;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_ID)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_id *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&id, ext, sizeof(id));
|
2004-03-12 09:26:59 +08:00
|
|
|
if (sizeof(*p) < item_len) {
|
2015-04-27 08:24:42 +08:00
|
|
|
data = (const u_char *)(p + 1);
|
2004-03-12 09:26:59 +08:00
|
|
|
len = item_len - sizeof(*p);
|
|
|
|
} else {
|
1999-10-30 13:11:06 +08:00
|
|
|
data = NULL;
|
2004-03-12 09:26:59 +08:00
|
|
|
len = 0;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
|
|
|
#if 0 /*debug*/
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [phase=%d doi=%d proto=%d]", phase, doi, proto));
|
1999-10-30 13:11:06 +08:00
|
|
|
#endif
|
|
|
|
switch (phase) {
|
|
|
|
#ifndef USE_IPSECDOI_IN_PHASE1
|
|
|
|
case 1:
|
|
|
|
#endif
|
|
|
|
default:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.d.id_type, idtypestr)));
|
|
|
|
ND_PRINT((ndo," doi_data=%u",
|
2014-04-23 15:20:40 +08:00
|
|
|
(uint32_t)(ntohl(id.d.doi_data) & 0xffffff)));
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
|
|
|
|
#ifdef USE_IPSECDOI_IN_PHASE1
|
|
|
|
case 1:
|
|
|
|
#endif
|
|
|
|
case 2:
|
|
|
|
{
|
2015-07-13 02:32:35 +08:00
|
|
|
const struct ipsecdoi_id *doi_p;
|
|
|
|
struct ipsecdoi_id doi_id;
|
2017-08-27 21:15:17 +08:00
|
|
|
const char *p_name;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-07-13 02:32:35 +08:00
|
|
|
doi_p = (const struct ipsecdoi_id *)ext;
|
|
|
|
ND_TCHECK(*doi_p);
|
|
|
|
UNALIGNED_MEMCPY(&doi_id, ext, sizeof(doi_id));
|
|
|
|
ND_PRINT((ndo," idtype=%s", STR_OR_ID(doi_id.type, ipsecidtypestr)));
|
2014-05-04 03:36:06 +08:00
|
|
|
/* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */
|
2017-08-27 21:15:17 +08:00
|
|
|
if (!ndo->ndo_nflag && doi_id.proto_id && (p_name = netdb_protoname(doi_id.proto_id)) != NULL)
|
|
|
|
ND_PRINT((ndo," protoid=%s", p_name));
|
2014-05-04 03:36:06 +08:00
|
|
|
else
|
2015-07-13 02:32:35 +08:00
|
|
|
ND_PRINT((ndo," protoid=%u", doi_id.proto_id));
|
|
|
|
ND_PRINT((ndo," port=%d", ntohs(doi_id.port)));
|
1999-10-30 13:11:06 +08:00
|
|
|
if (!len)
|
|
|
|
break;
|
2004-03-12 10:17:18 +08:00
|
|
|
if (data == NULL)
|
|
|
|
goto trunc;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK2(*data, len);
|
2015-07-13 02:32:35 +08:00
|
|
|
switch (doi_id.type) {
|
1999-10-30 13:11:06 +08:00
|
|
|
case IPSECDOI_ID_IPV4_ADDR:
|
2004-03-24 09:32:20 +08:00
|
|
|
if (len < 4)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d [bad: < 4]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else
|
2014-04-04 15:43:46 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s", len, ipaddr_string(ndo, data)));
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
case IPSECDOI_ID_FQDN:
|
|
|
|
case IPSECDOI_ID_USER_FQDN:
|
|
|
|
{
|
|
|
|
int i;
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d ", len));
|
2001-01-28 16:06:06 +08:00
|
|
|
for (i = 0; i < len; i++)
|
2017-12-01 22:19:56 +08:00
|
|
|
safeputchar(ndo, EXTRACT_U_1(data + i));
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IPSECDOI_ID_IPV4_ADDR_SUBNET:
|
|
|
|
{
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *mask;
|
2004-03-24 09:32:20 +08:00
|
|
|
if (len < 8)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d [bad: < 8]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else {
|
|
|
|
mask = data + sizeof(struct in_addr);
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s/%u.%u.%u.%u", len,
|
2014-04-04 15:43:46 +08:00
|
|
|
ipaddr_string(ndo, data),
|
2017-11-26 20:02:48 +08:00
|
|
|
EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1),
|
|
|
|
EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3)));
|
2004-03-24 09:32:20 +08:00
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IPSECDOI_ID_IPV6_ADDR:
|
2004-03-24 09:32:20 +08:00
|
|
|
if (len < 16)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d [bad: < 16]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else
|
2014-04-04 15:43:46 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s", len, ip6addr_string(ndo, data)));
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
case IPSECDOI_ID_IPV6_ADDR_SUBNET:
|
|
|
|
{
|
2014-01-17 04:09:51 +08:00
|
|
|
const u_char *mask;
|
2017-08-24 11:45:39 +08:00
|
|
|
if (len < 32)
|
|
|
|
ND_PRINT((ndo," len=%d [bad: < 32]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else {
|
2015-04-27 08:24:42 +08:00
|
|
|
mask = (const u_char *)(data + sizeof(struct in6_addr));
|
2004-03-24 09:32:20 +08:00
|
|
|
/*XXX*/
|
2014-01-17 04:09:51 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,
|
2014-04-04 15:43:46 +08:00
|
|
|
ip6addr_string(ndo, data),
|
2017-11-26 20:02:48 +08:00
|
|
|
EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1), EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3),
|
|
|
|
EXTRACT_U_1(mask + 4), EXTRACT_U_1(mask + 5), EXTRACT_U_1(mask + 6), EXTRACT_U_1(mask + 7),
|
|
|
|
EXTRACT_U_1(mask + 8), EXTRACT_U_1(mask + 9), EXTRACT_U_1(mask + 10), EXTRACT_U_1(mask + 11),
|
|
|
|
EXTRACT_U_1(mask + 12), EXTRACT_U_1(mask + 13), EXTRACT_U_1(mask + 14), EXTRACT_U_1(mask + 15)));
|
2004-03-24 09:32:20 +08:00
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IPSECDOI_ID_IPV4_ADDR_RANGE:
|
2004-03-24 09:32:20 +08:00
|
|
|
if (len < 8)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d [bad: < 8]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s-%s", len,
|
2014-04-04 15:43:46 +08:00
|
|
|
ipaddr_string(ndo, data),
|
|
|
|
ipaddr_string(ndo, data + sizeof(struct in_addr))));
|
2004-03-24 09:32:20 +08:00
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
case IPSECDOI_ID_IPV6_ADDR_RANGE:
|
2004-03-24 09:32:20 +08:00
|
|
|
if (len < 32)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d [bad: < 32]", len));
|
2004-03-24 09:32:20 +08:00
|
|
|
else {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d %s-%s", len,
|
2014-04-04 15:43:46 +08:00
|
|
|
ip6addr_string(ndo, data),
|
|
|
|
ip6addr_string(ndo, data + sizeof(struct in6_addr))));
|
2004-03-24 09:32:20 +08:00
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
len = 0;
|
|
|
|
break;
|
|
|
|
case IPSECDOI_ID_DER_ASN1_DN:
|
|
|
|
case IPSECDOI_ID_DER_ASN1_GN:
|
|
|
|
case IPSECDOI_ID_KEY_ID:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (data && len) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", len));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)data, len))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + item_len;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_ID)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_,
|
2016-08-19 07:58:35 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_,
|
|
|
|
uint32_t doi0 _U_,
|
|
|
|
uint32_t proto0 _U_, int depth _U_)
|
2000-04-24 20:49:11 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_cert *p;
|
|
|
|
struct ikev1_pl_cert cert;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *certstr[] = {
|
2000-04-24 20:49:11 +08:00
|
|
|
"none", "pkcs7", "pgp", "dns",
|
|
|
|
"x509sign", "x509ke", "kerberos", "crl",
|
|
|
|
"arl", "spki", "x509attr",
|
|
|
|
};
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CERT)));
|
2000-04-24 20:49:11 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_cert *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", item_len - 4));
|
|
|
|
ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < item_len) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
2000-04-24 20:49:11 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + item_len;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CERT)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
2000-04-24 20:49:11 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_,
|
2016-08-19 07:58:35 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi0 _U_,
|
|
|
|
uint32_t proto0 _U_, int depth _U_)
|
2000-09-23 12:43:42 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_cert *p;
|
|
|
|
struct ikev1_pl_cert cert;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *certstr[] = {
|
2000-09-23 12:43:42 +08:00
|
|
|
"none", "pkcs7", "pgp", "dns",
|
|
|
|
"x509sign", "x509ke", "kerberos", "crl",
|
|
|
|
"arl", "spki", "x509attr",
|
|
|
|
};
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CR)));
|
2000-09-23 12:43:42 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_cert *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", item_len - 4));
|
|
|
|
ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < item_len) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
2000-09-23 12:43:42 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + item_len;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CR)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
2000-09-23 12:43:42 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_hash_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_HASH)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_HASH)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_sig_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2000-04-24 20:49:11 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SIG)));
|
2000-04-24 20:49:11 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
2000-04-24 20:49:11 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SIG)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
2000-04-24 20:49:11 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_nonce_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_,
|
2016-08-19 07:58:35 +08:00
|
|
|
const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_NONCE)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2017-02-07 06:33:50 +08:00
|
|
|
/*
|
|
|
|
* Our caller has ensured that the length is >= 4.
|
|
|
|
*/
|
|
|
|
ND_PRINT((ndo," n len=%u", ntohs(e.len) - 4));
|
|
|
|
if (ntohs(e.len) > 4) {
|
|
|
|
if (ndo->ndo_vflag > 2) {
|
|
|
|
ND_PRINT((ndo, " "));
|
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
|
|
|
goto trunc;
|
|
|
|
} else if (ndo->ndo_vflag > 1) {
|
|
|
|
ND_PRINT((ndo, " "));
|
|
|
|
if (!ike_show_somedata(ndo, (const u_char *)(ext + 1), ep))
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2017-02-07 06:33:50 +08:00
|
|
|
const u_char *ep, uint32_t phase _U_, uint32_t doi0 _U_,
|
|
|
|
uint32_t proto0 _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2015-04-27 08:24:42 +08:00
|
|
|
const struct ikev1_pl_n *p;
|
|
|
|
struct ikev1_pl_n n;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *cp;
|
2015-04-27 08:24:42 +08:00
|
|
|
const u_char *ep2;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi;
|
|
|
|
uint32_t proto;
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *notify_error_str[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
NULL, "INVALID-PAYLOAD-TYPE",
|
|
|
|
"DOI-NOT-SUPPORTED", "SITUATION-NOT-SUPPORTED",
|
|
|
|
"INVALID-COOKIE", "INVALID-MAJOR-VERSION",
|
|
|
|
"INVALID-MINOR-VERSION", "INVALID-EXCHANGE-TYPE",
|
|
|
|
"INVALID-FLAGS", "INVALID-MESSAGE-ID",
|
|
|
|
"INVALID-PROTOCOL-ID", "INVALID-SPI",
|
|
|
|
"INVALID-TRANSFORM-ID", "ATTRIBUTES-NOT-SUPPORTED",
|
|
|
|
"NO-PROPOSAL-CHOSEN", "BAD-PROPOSAL-SYNTAX",
|
|
|
|
"PAYLOAD-MALFORMED", "INVALID-KEY-INFORMATION",
|
|
|
|
"INVALID-ID-INFORMATION", "INVALID-CERT-ENCODING",
|
|
|
|
"INVALID-CERTIFICATE", "CERT-TYPE-UNSUPPORTED",
|
|
|
|
"INVALID-CERT-AUTHORITY", "INVALID-HASH-INFORMATION",
|
|
|
|
"AUTHENTICATION-FAILED", "INVALID-SIGNATURE",
|
|
|
|
"ADDRESS-NOTIFICATION", "NOTIFY-SA-LIFETIME",
|
|
|
|
"CERTIFICATE-UNAVAILABLE", "UNSUPPORTED-EXCHANGE-TYPE",
|
|
|
|
"UNEQUAL-PAYLOAD-LENGTHS",
|
|
|
|
};
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
static const char *ipsec_notify_error_str[] = {
|
|
|
|
"RESERVED",
|
|
|
|
};
|
|
|
|
static const char *notify_status_str[] = {
|
|
|
|
"CONNECTED",
|
|
|
|
};
|
|
|
|
static const char *ipsec_notify_status_str[] = {
|
1999-10-30 13:11:06 +08:00
|
|
|
"RESPONDER-LIFETIME", "REPLAY-STATUS",
|
|
|
|
"INITIAL-CONTACT",
|
|
|
|
};
|
|
|
|
/* NOTE: these macro must be called with x in proper range */
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
|
|
|
|
/* 0 - 8191 */
|
|
|
|
#define NOTIFY_ERROR_STR(x) \
|
|
|
|
STR_OR_ID((x), notify_error_str)
|
|
|
|
|
|
|
|
/* 8192 - 16383 */
|
|
|
|
#define IPSEC_NOTIFY_ERROR_STR(x) \
|
|
|
|
STR_OR_ID((u_int)((x) - 8192), ipsec_notify_error_str)
|
|
|
|
|
|
|
|
/* 16384 - 24575 */
|
|
|
|
#define NOTIFY_STATUS_STR(x) \
|
|
|
|
STR_OR_ID((u_int)((x) - 16384), notify_status_str)
|
|
|
|
|
|
|
|
/* 24576 - 32767 */
|
|
|
|
#define IPSEC_NOTIFY_STATUS_STR(x) \
|
|
|
|
STR_OR_ID((u_int)((x) - 24576), ipsec_notify_status_str)
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_N)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_n *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&n, ext, sizeof(n));
|
2000-10-03 13:16:38 +08:00
|
|
|
doi = ntohl(n.doi);
|
|
|
|
proto = n.prot_id;
|
1999-10-30 13:11:06 +08:00
|
|
|
if (doi != 1) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=%d", doi));
|
|
|
|
ND_PRINT((ndo," proto=%d", proto));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
if (ntohs(n.type) < 8192)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", NOTIFY_ERROR_STR(ntohs(n.type))));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
else if (ntohs(n.type) < 16384)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
else if (ntohs(n.type) < 24576)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", NOTIFY_STATUS_STR(ntohs(n.type))));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
else
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
|
2000-10-03 13:16:38 +08:00
|
|
|
if (n.spi_size) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," spi="));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)(p + 1) + n.spi_size;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=ipsec"));
|
|
|
|
ND_PRINT((ndo," proto=%s", PROTOIDSTR(proto)));
|
2000-10-03 13:16:38 +08:00
|
|
|
if (ntohs(n.type) < 8192)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", NOTIFY_ERROR_STR(ntohs(n.type))));
|
2000-10-03 13:16:38 +08:00
|
|
|
else if (ntohs(n.type) < 16384)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", IPSEC_NOTIFY_ERROR_STR(ntohs(n.type))));
|
2000-10-03 13:16:38 +08:00
|
|
|
else if (ntohs(n.type) < 24576)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", NOTIFY_STATUS_STR(ntohs(n.type))));
|
Add a few more GCC warnings on GCC >= 2 for ".devel" builds.
From Neil T. Spring: fixes for many of those warnings:
addrtoname.c, configure.in: Linux needs netinet/ether.h for
ether_ntohost
print-*.c: change char *foo = "bar" to const char *foo = "bar"
to appease -Wwrite-strings; should affect no run-time behavior.
print-*.c: make some variables unsigned.
print-bgp.c: plen ('prefix len') is unsigned, no reason to
validate by comparing to zero.
print-cnfp.c, print-rx.c: use intoa, provided by addrtoname,
instead of inet_ntoa.
print-domain.c: unsigned int l; (l=foo()) < 0 is guaranteed to
be false, so check for (u_int)-1, which represents failure,
explicitly.
print-isakmp.c: complete initialization of attrmap objects.
print-lwres.c: "if(x); print foo;" seemed much more likely to be
intended to be "if(x) { print foo; }".
print-smb.c: complete initialization of some structures.
In addition, add some fixes for the signed vs. unsigned comparison
warnings:
extract.h: cast the result of the byte-extraction-and-combining,
as, at least for the 16-bit version, C's integral promotions
will turn "u_int16_t" into "int" if there are other "int"s
nearby.
print-*.c: make some more variables unsigned, or add casts to an
unsigned type of signed values known not to be negative, or add
casts to "int" of unsigned values known to fit in an "int", and
make other changes needed to handle the aforementioned variables
now being unsigned.
print-isakmp.c: clean up the handling of error/status indicators
in notify messages.
print-ppp.c: get rid of a check that an unsigned quantity is >=
0.
print-radius.c: clean up some of the bounds checking.
print-smb.c: extract the word count into a "u_int" to avoid the
aforementioned problems with C's integral promotions.
print-snmp.c: change a check that an unsigned variable is >= 0
to a check that it's != 0.
Also, fix some formats to use "%u" rather than "%d" for unsigned
quantities.
2002-09-05 08:00:07 +08:00
|
|
|
else if (ntohs(n.type) < 32768)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", IPSEC_NOTIFY_STATUS_STR(ntohs(n.type))));
|
1999-10-30 13:11:06 +08:00
|
|
|
else
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
|
2000-10-03 13:16:38 +08:00
|
|
|
if (n.spi_size) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," spi="));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)(p + 1) + n.spi_size;
|
|
|
|
ep2 = (const u_char *)p + item_len;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
|
|
|
if (cp < ep) {
|
2000-10-03 13:16:38 +08:00
|
|
|
switch (ntohs(n.type)) {
|
1999-10-30 13:11:06 +08:00
|
|
|
case IPSECDOI_NTYPE_RESPONDER_LIFETIME:
|
|
|
|
{
|
2002-09-05 08:43:21 +08:00
|
|
|
const struct attrmap *map = oakley_t_map;
|
1999-10-30 13:11:06 +08:00
|
|
|
size_t nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
|
2017-02-07 06:33:50 +08:00
|
|
|
ND_PRINT((ndo," attrs=("));
|
1999-10-30 13:11:06 +08:00
|
|
|
while (cp < ep && cp < ep2) {
|
2017-06-12 12:06:55 +08:00
|
|
|
cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap);
|
|
|
|
if (cp == NULL) {
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2017-02-07 06:33:50 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
case IPSECDOI_NTYPE_REPLAY_STATUS:
|
2017-02-07 06:33:50 +08:00
|
|
|
ND_PRINT((ndo," status=("));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"replay detection %sabled",
|
2017-11-23 06:54:09 +08:00
|
|
|
EXTRACT_BE_U_4(cp) ? "en" : "dis"));
|
2017-02-07 06:33:50 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
1999-10-30 13:11:06 +08:00
|
|
|
break;
|
|
|
|
default:
|
2017-02-07 06:33:50 +08:00
|
|
|
/*
|
|
|
|
* XXX - fill in more types here; see, for example,
|
|
|
|
* draft-ietf-ipsec-notifymsg-04.
|
|
|
|
*/
|
|
|
|
if (ndo->ndo_vflag > 3) {
|
|
|
|
ND_PRINT((ndo," data=("));
|
|
|
|
if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))
|
|
|
|
goto trunc;
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
} else {
|
|
|
|
if (!ike_show_somedata(ndo, cp, ep))
|
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
break;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + item_len;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_d_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi0 _U_,
|
|
|
|
uint32_t proto0 _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev1_pl_d *p;
|
|
|
|
struct ikev1_pl_d d;
|
2014-04-23 15:20:40 +08:00
|
|
|
const uint8_t *q;
|
|
|
|
uint32_t doi;
|
|
|
|
uint32_t proto;
|
1999-10-30 13:11:06 +08:00
|
|
|
int i;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_D)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev1_pl_d *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&d, ext, sizeof(d));
|
2000-10-03 13:16:38 +08:00
|
|
|
doi = ntohl(d.doi);
|
|
|
|
proto = d.prot_id;
|
1999-10-30 13:11:06 +08:00
|
|
|
if (doi != 1) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=%u", doi));
|
|
|
|
ND_PRINT((ndo," proto=%u", proto));
|
1999-10-30 13:11:06 +08:00
|
|
|
} else {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," doi=ipsec"));
|
|
|
|
ND_PRINT((ndo," proto=%s", PROTOIDSTR(proto)));
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," spilen=%u", d.spi_size));
|
|
|
|
ND_PRINT((ndo," nspi=%u", ntohs(d.num_spi)));
|
|
|
|
ND_PRINT((ndo," spi="));
|
2015-04-27 08:24:42 +08:00
|
|
|
q = (const uint8_t *)(p + 1);
|
2000-10-03 13:16:38 +08:00
|
|
|
for (i = 0; i < ntohs(d.num_spi); i++) {
|
1999-10-30 13:11:06 +08:00
|
|
|
if (i != 0)
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,","));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)q, d.spi_size))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
2000-10-03 13:16:38 +08:00
|
|
|
q += d.spi_size;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
return q;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_D)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev1_vid_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_VID)));
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2004-03-12 10:17:18 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_VID)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
/************************************************************/
|
|
|
|
/* */
|
|
|
|
/* IKE v2 - rfc4306 - dissector */
|
|
|
|
/* */
|
|
|
|
/************************************************************/
|
|
|
|
|
|
|
|
static void
|
|
|
|
ikev2_pay_print(netdissect_options *ndo, const char *payname, int critical)
|
|
|
|
{
|
|
|
|
ND_PRINT((ndo,"%s%s:", payname, critical&0x80 ? "[C]" : ""));
|
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev2_gen_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
|
|
|
}
|
2003-12-15 18:40:13 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2017-01-16 05:49:26 +08:00
|
|
|
ikev2_t_print(netdissect_options *ndo, int tcount,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, u_int item_len,
|
2017-01-16 05:49:26 +08:00
|
|
|
const u_char *ep)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const struct ikev2_t *p;
|
|
|
|
struct ikev2_t t;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint16_t t_id;
|
2007-08-29 10:38:14 +08:00
|
|
|
const u_char *cp;
|
|
|
|
const char *idstr;
|
|
|
|
const struct attrmap *map;
|
|
|
|
size_t nmap;
|
|
|
|
const u_char *ep2;
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev2_t *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&t, ext, sizeof(t));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), t.h.critical);
|
|
|
|
|
|
|
|
t_id = ntohs(t.t_id);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
map = NULL;
|
|
|
|
nmap = 0;
|
|
|
|
|
|
|
|
switch (t.t_type) {
|
|
|
|
case IV2_T_ENCR:
|
|
|
|
idstr = STR_OR_ID(t_id, esp_p_map);
|
|
|
|
map = encr_t_map;
|
|
|
|
nmap = sizeof(encr_t_map)/sizeof(encr_t_map[0]);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_T_PRF:
|
|
|
|
idstr = STR_OR_ID(t_id, prf_p_map);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_T_INTEG:
|
|
|
|
idstr = STR_OR_ID(t_id, integ_p_map);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_T_DH:
|
|
|
|
idstr = STR_OR_ID(t_id, dh_p_map);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_T_ESN:
|
|
|
|
idstr = STR_OR_ID(t_id, esn_p_map);
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
idstr = NULL;
|
|
|
|
break;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2002-09-05 08:43:21 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
if (idstr)
|
2017-01-16 05:49:26 +08:00
|
|
|
ND_PRINT((ndo," #%u type=%s id=%s ", tcount,
|
2007-08-29 10:38:14 +08:00
|
|
|
STR_OR_ID(t.t_type, ikev2_t_type_map),
|
|
|
|
idstr));
|
|
|
|
else
|
2017-01-16 05:49:26 +08:00
|
|
|
ND_PRINT((ndo," #%u type=%s id=%u ", tcount,
|
2007-08-29 10:38:14 +08:00
|
|
|
STR_OR_ID(t.t_type, ikev2_t_type_map),
|
|
|
|
t.t_id));
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)(p + 1);
|
|
|
|
ep2 = (const u_char *)p + item_len;
|
2007-08-29 10:38:14 +08:00
|
|
|
while (cp < ep && cp < ep2) {
|
|
|
|
if (map && nmap) {
|
2017-06-12 12:06:55 +08:00
|
|
|
cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap);
|
2007-08-29 10:38:14 +08:00
|
|
|
} else
|
2017-06-12 12:06:55 +08:00
|
|
|
cp = ikev1_attr_print(ndo, cp, ep2);
|
|
|
|
if (cp == NULL)
|
|
|
|
goto trunc;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
if (ep < ep2)
|
|
|
|
ND_PRINT((ndo,"..."));
|
1999-10-30 13:11:06 +08:00
|
|
|
return cp;
|
2004-03-12 10:17:18 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_T)));
|
2004-03-12 10:17:18 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2002-09-05 08:43:21 +08:00
|
|
|
static const u_char *
|
2007-08-29 10:58:43 +08:00
|
|
|
ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,
|
2017-01-16 05:49:26 +08:00
|
|
|
const struct isakmp_gen *ext, u_int oprop_length,
|
|
|
|
const u_char *ep, int depth)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct ikev2_p *p;
|
|
|
|
struct ikev2_p prop;
|
2017-01-16 05:49:26 +08:00
|
|
|
u_int prop_length;
|
2002-09-05 08:43:21 +08:00
|
|
|
const u_char *cp;
|
2017-01-16 05:49:26 +08:00
|
|
|
int i;
|
|
|
|
int tcount;
|
|
|
|
u_char np;
|
|
|
|
struct isakmp_gen e;
|
|
|
|
u_int item_len;
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
p = (const struct ikev2_p *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));
|
2017-01-16 05:49:26 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);
|
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* ikev2_sa_print() guarantees that this is >= 4.
|
|
|
|
*/
|
|
|
|
prop_length = oprop_length - 4;
|
2007-11-23 05:53:43 +08:00
|
|
|
ND_PRINT((ndo," #%u protoid=%s transform=%d len=%u",
|
|
|
|
prop.p_no, PROTOIDSTR(prop.prot_id),
|
2017-01-16 05:49:26 +08:00
|
|
|
prop.num_t, oprop_length));
|
|
|
|
cp = (const u_char *)(p + 1);
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
if (prop.spi_size) {
|
2017-01-16 05:49:26 +08:00
|
|
|
if (prop_length < prop.spi_size)
|
|
|
|
goto toolong;
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," spi="));
|
2017-01-16 05:49:26 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)cp, prop.spi_size))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
2017-01-16 05:49:26 +08:00
|
|
|
cp += prop.spi_size;
|
|
|
|
prop_length -= prop.spi_size;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* Print the transforms.
|
|
|
|
*/
|
|
|
|
tcount = 0;
|
|
|
|
for (np = ISAKMP_NPTYPE_T; np != 0; np = e.np) {
|
|
|
|
tcount++;
|
|
|
|
ext = (const struct isakmp_gen *)cp;
|
|
|
|
if (prop_length < sizeof(*ext))
|
|
|
|
goto toolong;
|
|
|
|
ND_TCHECK(*ext);
|
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* Since we can't have a payload length of less than 4 bytes,
|
|
|
|
* we need to bail out here if the generic header is nonsensical
|
|
|
|
* or truncated, otherwise we could loop forever processing
|
|
|
|
* zero-length items or otherwise misdissect the packet.
|
|
|
|
*/
|
|
|
|
item_len = ntohs(e.len);
|
|
|
|
if (item_len <= 4)
|
|
|
|
goto trunc;
|
|
|
|
|
|
|
|
if (prop_length < item_len)
|
|
|
|
goto toolong;
|
|
|
|
ND_TCHECK2(*cp, item_len);
|
|
|
|
|
|
|
|
depth++;
|
|
|
|
ND_PRINT((ndo,"\n"));
|
|
|
|
for (i = 0; i < depth; i++)
|
|
|
|
ND_PRINT((ndo," "));
|
|
|
|
ND_PRINT((ndo,"("));
|
|
|
|
if (np == ISAKMP_NPTYPE_T) {
|
|
|
|
cp = ikev2_t_print(ndo, tcount, ext, item_len, ep);
|
|
|
|
if (cp == NULL) {
|
|
|
|
/* error, already reported */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo, "%s", NPSTR(np)));
|
|
|
|
cp += item_len;
|
|
|
|
}
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
depth--;
|
|
|
|
prop_length -= item_len;
|
|
|
|
}
|
|
|
|
return cp;
|
|
|
|
toolong:
|
|
|
|
/*
|
|
|
|
* Skip the rest of the proposal.
|
|
|
|
*/
|
|
|
|
cp += prop_length;
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P)));
|
2007-08-29 10:38:14 +08:00
|
|
|
return cp;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P)));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_sa_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext1,
|
2017-01-16 05:49:26 +08:00
|
|
|
u_int osa_length, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
2016-08-19 07:58:35 +08:00
|
|
|
uint32_t proto _U_, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
2017-01-16 05:49:26 +08:00
|
|
|
const struct isakmp_gen *ext;
|
2000-10-03 13:16:38 +08:00
|
|
|
struct isakmp_gen e;
|
2017-01-16 05:49:26 +08:00
|
|
|
u_int sa_length;
|
|
|
|
const u_char *cp;
|
|
|
|
int i;
|
|
|
|
int pcount;
|
|
|
|
u_char np;
|
|
|
|
u_int item_len;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext1);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext1, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, "sa", e.critical);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* ikev2_sub0_print() guarantees that this is >= 4.
|
|
|
|
*/
|
2009-06-29 15:55:07 +08:00
|
|
|
osa_length= ntohs(e.len);
|
|
|
|
sa_length = osa_length - 4;
|
|
|
|
ND_PRINT((ndo," len=%d", sa_length));
|
2000-10-03 13:16:38 +08:00
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* Print the payloads.
|
|
|
|
*/
|
|
|
|
cp = (const u_char *)(ext1 + 1);
|
|
|
|
pcount = 0;
|
|
|
|
for (np = ISAKMP_NPTYPE_P; np != 0; np = e.np) {
|
|
|
|
pcount++;
|
|
|
|
ext = (const struct isakmp_gen *)cp;
|
|
|
|
if (sa_length < sizeof(*ext))
|
|
|
|
goto toolong;
|
|
|
|
ND_TCHECK(*ext);
|
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2004-03-12 10:17:18 +08:00
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
/*
|
|
|
|
* Since we can't have a payload length of less than 4 bytes,
|
|
|
|
* we need to bail out here if the generic header is nonsensical
|
|
|
|
* or truncated, otherwise we could loop forever processing
|
|
|
|
* zero-length items or otherwise misdissect the packet.
|
|
|
|
*/
|
|
|
|
item_len = ntohs(e.len);
|
|
|
|
if (item_len <= 4)
|
|
|
|
goto trunc;
|
|
|
|
|
|
|
|
if (sa_length < item_len)
|
|
|
|
goto toolong;
|
|
|
|
ND_TCHECK2(*cp, item_len);
|
|
|
|
|
|
|
|
depth++;
|
|
|
|
ND_PRINT((ndo,"\n"));
|
|
|
|
for (i = 0; i < depth; i++)
|
|
|
|
ND_PRINT((ndo," "));
|
|
|
|
ND_PRINT((ndo,"("));
|
|
|
|
if (np == ISAKMP_NPTYPE_P) {
|
|
|
|
cp = ikev2_p_print(ndo, np, pcount, ext, item_len,
|
|
|
|
ep, depth);
|
|
|
|
if (cp == NULL) {
|
|
|
|
/* error, already reported */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo, "%s", NPSTR(np)));
|
|
|
|
cp += item_len;
|
|
|
|
}
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
depth--;
|
|
|
|
sa_length -= item_len;
|
|
|
|
}
|
|
|
|
return cp;
|
|
|
|
toolong:
|
|
|
|
/*
|
|
|
|
* Skip the rest of the SA.
|
|
|
|
*/
|
|
|
|
cp += sa_length;
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return cp;
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_ke_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
struct ikev2_ke ke;
|
2015-04-27 08:24:42 +08:00
|
|
|
const struct ikev2_ke *k;
|
2002-09-05 08:43:21 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
k = (const struct ikev2_ke *)ext;
|
2017-08-24 12:08:42 +08:00
|
|
|
ND_TCHECK(*k);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&ke, ext, sizeof(ke));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);
|
|
|
|
|
|
|
|
ND_PRINT((ndo," len=%u group=%s", ntohs(ke.h.len) - 8,
|
|
|
|
STR_OR_ID(ntohs(ke.ke_group), dh_p_map)));
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 8 < ntohs(ke.h.len)) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(k + 1), ntohs(ke.h.len) - 8))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(ke.h.len);
|
2004-01-07 16:00:51 +08:00
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
2004-01-07 16:00:51 +08:00
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_ID_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2017-08-24 12:08:42 +08:00
|
|
|
const struct ikev2_id *idp;
|
2007-11-25 02:13:33 +08:00
|
|
|
struct ikev2_id id;
|
|
|
|
int id_len, idtype_len, i;
|
|
|
|
unsigned int dumpascii, dumphex;
|
2015-04-27 08:24:42 +08:00
|
|
|
const unsigned char *typedata;
|
2007-11-25 02:13:33 +08:00
|
|
|
|
2017-08-24 12:08:42 +08:00
|
|
|
idp = (const struct ikev2_id *)ext;
|
|
|
|
ND_TCHECK(*idp);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&id, ext, sizeof(id));
|
2007-11-25 02:13:33 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), id.h.critical);
|
|
|
|
|
|
|
|
id_len = ntohs(id.h.len);
|
|
|
|
|
|
|
|
ND_PRINT((ndo," len=%d", id_len - 4));
|
|
|
|
if (2 < ndo->ndo_vflag && 4 < id_len) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-11-25 02:13:33 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), id_len - 4))
|
2007-11-25 02:13:33 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
|
|
|
|
idtype_len =id_len - sizeof(struct ikev2_id);
|
|
|
|
dumpascii = 0;
|
|
|
|
dumphex = 0;
|
2015-04-27 08:24:42 +08:00
|
|
|
typedata = (const unsigned char *)(ext)+sizeof(struct ikev2_id);
|
2007-11-25 02:13:33 +08:00
|
|
|
|
|
|
|
switch(id.type) {
|
|
|
|
case ID_IPV4_ADDR:
|
|
|
|
ND_PRINT((ndo, " ipv4:"));
|
|
|
|
dumphex=1;
|
|
|
|
break;
|
|
|
|
case ID_FQDN:
|
|
|
|
ND_PRINT((ndo, " fqdn:"));
|
|
|
|
dumpascii=1;
|
|
|
|
break;
|
|
|
|
case ID_RFC822_ADDR:
|
|
|
|
ND_PRINT((ndo, " rfc822:"));
|
|
|
|
dumpascii=1;
|
|
|
|
break;
|
|
|
|
case ID_IPV6_ADDR:
|
|
|
|
ND_PRINT((ndo, " ipv6:"));
|
|
|
|
dumphex=1;
|
|
|
|
break;
|
|
|
|
case ID_DER_ASN1_DN:
|
|
|
|
ND_PRINT((ndo, " dn:"));
|
|
|
|
dumphex=1;
|
|
|
|
break;
|
|
|
|
case ID_DER_ASN1_GN:
|
|
|
|
ND_PRINT((ndo, " gn:"));
|
|
|
|
dumphex=1;
|
|
|
|
break;
|
|
|
|
case ID_KEY_ID:
|
|
|
|
ND_PRINT((ndo, " keyid:"));
|
|
|
|
dumphex=1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if(dumpascii) {
|
|
|
|
ND_TCHECK2(*typedata, idtype_len);
|
|
|
|
for(i=0; i<idtype_len; i++) {
|
2017-12-01 22:19:56 +08:00
|
|
|
if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
|
2017-12-02 05:35:28 +08:00
|
|
|
ND_PRINT((ndo, "%c", EXTRACT_U_1(typedata + i)));
|
2007-11-25 02:13:33 +08:00
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo, "."));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(dumphex) {
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)typedata, idtype_len))
|
2007-11-25 02:13:33 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + id_len;
|
2007-11-25 02:13:33 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
1999-10-18 05:59:12 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_cert_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2000-10-03 13:16:38 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
2000-10-03 13:16:38 +08:00
|
|
|
}
|
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_cr_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
1999-10-30 13:11:06 +08:00
|
|
|
{
|
2007-08-29 10:38:14 +08:00
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
|
|
|
}
|
1999-10-18 05:59:12 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_auth_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
2016-08-19 07:58:35 +08:00
|
|
|
u_int item_len _U_, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
2007-11-27 11:57:20 +08:00
|
|
|
struct ikev2_auth a;
|
2007-08-29 10:58:43 +08:00
|
|
|
const char *v2_auth[]={ "invalid", "rsasig",
|
|
|
|
"shared-secret", "dsssig" };
|
2015-04-27 08:24:42 +08:00
|
|
|
const u_char *authdata = (const u_char*)ext + sizeof(a);
|
2007-11-27 11:57:20 +08:00
|
|
|
unsigned int len;
|
1999-10-18 05:59:12 +08:00
|
|
|
|
2017-08-24 12:08:42 +08:00
|
|
|
ND_TCHECK2(*ext, sizeof(a));
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&a, ext, sizeof(a));
|
2007-11-27 11:57:20 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
|
|
|
|
len = ntohs(a.h.len);
|
2000-10-03 13:16:38 +08:00
|
|
|
|
2017-02-07 06:33:50 +08:00
|
|
|
/*
|
|
|
|
* Our caller has ensured that the length is >= 4.
|
|
|
|
*/
|
|
|
|
ND_PRINT((ndo," len=%u method=%s", len-4,
|
2007-11-27 11:57:20 +08:00
|
|
|
STR_OR_ID(a.auth_method, v2_auth)));
|
2017-02-07 06:33:50 +08:00
|
|
|
if (len > 4) {
|
|
|
|
if (ndo->ndo_vflag > 1) {
|
|
|
|
ND_PRINT((ndo, " authdata=("));
|
|
|
|
if (!rawprint(ndo, (const uint8_t *)authdata, len - sizeof(a)))
|
|
|
|
goto trunc;
|
|
|
|
ND_PRINT((ndo, ") "));
|
|
|
|
} else if (ndo->ndo_vflag) {
|
|
|
|
if (!ike_show_somedata(ndo, authdata, ep))
|
|
|
|
goto trunc;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + len;
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_nonce_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
2016-08-19 07:58:35 +08:00
|
|
|
u_int item_len _U_, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
struct isakmp_gen e;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, "nonce", e.critical);
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
|
|
|
|
if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
|
|
|
ND_PRINT((ndo," nonce=("));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
|
|
|
ND_PRINT((ndo,") "));
|
|
|
|
} else if(ndo->ndo_vflag && 4 < ntohs(e.len)) {
|
|
|
|
if(!ike_show_somedata(ndo, (const u_char *)(ext+1), ep)) goto trunc;
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
1999-10-18 05:59:12 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
/* notify payloads */
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_n_print(netdissect_options *ndo, u_char tpay _U_,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
2016-08-19 07:58:35 +08:00
|
|
|
u_int item_len, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
2015-04-27 08:24:42 +08:00
|
|
|
const struct ikev2_n *p;
|
|
|
|
struct ikev2_n n;
|
2007-08-29 10:38:14 +08:00
|
|
|
const u_char *cp;
|
2017-02-07 06:33:50 +08:00
|
|
|
u_char showspi, showsomedata;
|
2007-08-29 10:58:43 +08:00
|
|
|
const char *notify_name;
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t type;
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2015-04-27 09:37:43 +08:00
|
|
|
p = (const struct ikev2_n *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*p);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&n, ext, sizeof(n));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), n.h.critical);
|
|
|
|
|
|
|
|
showspi = 1;
|
|
|
|
showsomedata=0;
|
|
|
|
notify_name=NULL;
|
|
|
|
|
|
|
|
ND_PRINT((ndo," prot_id=%s", PROTOIDSTR(n.prot_id)));
|
|
|
|
|
|
|
|
type = ntohs(n.type);
|
|
|
|
|
|
|
|
/* notify space is annoying sparse */
|
|
|
|
switch(type) {
|
|
|
|
case IV2_NOTIFY_UNSUPPORTED_CRITICAL_PAYLOAD:
|
|
|
|
notify_name = "unsupported_critical_payload";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_IKE_SPI:
|
|
|
|
notify_name = "invalid_ike_spi";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_MAJOR_VERSION:
|
|
|
|
notify_name = "invalid_major_version";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_SYNTAX:
|
|
|
|
notify_name = "invalid_syntax";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_MESSAGE_ID:
|
|
|
|
notify_name = "invalid_message_id";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_SPI:
|
|
|
|
notify_name = "invalid_spi";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_NO_PROPOSAL_CHOSEN:
|
|
|
|
notify_name = "no_protocol_chosen";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_KE_PAYLOAD:
|
|
|
|
notify_name = "invalid_ke_payload";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_AUTHENTICATION_FAILED:
|
|
|
|
notify_name = "authentication_failed";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_SINGLE_PAIR_REQUIRED:
|
|
|
|
notify_name = "single_pair_required";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_NO_ADDITIONAL_SAS:
|
|
|
|
notify_name = "no_additional_sas";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INTERNAL_ADDRESS_FAILURE:
|
|
|
|
notify_name = "internal_address_failure";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
2014-01-02 10:27:54 +08:00
|
|
|
case IV2_NOTIFY_FAILED_CP_REQUIRED:
|
2007-08-29 10:38:14 +08:00
|
|
|
notify_name = "failed:cp_required";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INVALID_SELECTORS:
|
|
|
|
notify_name = "invalid_selectors";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_INITIAL_CONTACT:
|
|
|
|
notify_name = "initial_contact";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
2014-01-02 10:27:54 +08:00
|
|
|
case IV2_NOTIFY_SET_WINDOW_SIZE:
|
2007-08-29 10:38:14 +08:00
|
|
|
notify_name = "set_window_size";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_ADDITIONAL_TS_POSSIBLE:
|
|
|
|
notify_name = "additional_ts_possible";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
2014-01-02 10:27:54 +08:00
|
|
|
case IV2_NOTIFY_IPCOMP_SUPPORTED:
|
2007-08-29 10:38:14 +08:00
|
|
|
notify_name = "ipcomp_supported";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_NAT_DETECTION_SOURCE_IP:
|
|
|
|
notify_name = "nat_detection_source_ip";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_NAT_DETECTION_DESTINATION_IP:
|
|
|
|
notify_name = "nat_detection_destination_ip";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_COOKIE:
|
|
|
|
notify_name = "cookie";
|
|
|
|
showspi = 1;
|
|
|
|
showsomedata= 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_USE_TRANSPORT_MODE:
|
|
|
|
notify_name = "use_transport_mode";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_HTTP_CERT_LOOKUP_SUPPORTED:
|
|
|
|
notify_name = "http_cert_lookup_supported";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_REKEY_SA:
|
|
|
|
notify_name = "rekey_sa";
|
|
|
|
showspi = 1;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_ESP_TFC_PADDING_NOT_SUPPORTED:
|
|
|
|
notify_name = "tfc_padding_not_supported";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IV2_NOTIFY_NON_FIRST_FRAGMENTS_ALSO:
|
|
|
|
notify_name = "non_first_fragment_also";
|
|
|
|
showspi = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
if (type < 8192) {
|
|
|
|
notify_name="error";
|
|
|
|
} else if(type < 16384) {
|
|
|
|
notify_name="private-error";
|
|
|
|
} else if(type < 40960) {
|
|
|
|
notify_name="status";
|
|
|
|
} else {
|
|
|
|
notify_name="private-status";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if(notify_name) {
|
|
|
|
ND_PRINT((ndo," type=%u(%s)", type, notify_name));
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
if (showspi && n.spi_size) {
|
|
|
|
ND_PRINT((ndo," spi="));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)(p + 1) + n.spi_size;
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2017-02-07 06:33:50 +08:00
|
|
|
if (cp < ep) {
|
|
|
|
if (ndo->ndo_vflag > 3 || (showsomedata && ep-cp < 30)) {
|
|
|
|
ND_PRINT((ndo," data=("));
|
|
|
|
if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))
|
|
|
|
goto trunc;
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2017-02-07 06:33:50 +08:00
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
} else if (showsomedata) {
|
|
|
|
if (!ike_show_somedata(ndo, cp, ep))
|
|
|
|
goto trunc;
|
|
|
|
}
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + item_len;
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_d_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_vid_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
struct isakmp_gen e;
|
|
|
|
const u_char *vid;
|
|
|
|
int i, len;
|
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
|
|
|
|
ND_PRINT((ndo," len=%d vid=", ntohs(e.len) - 4));
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
vid = (const u_char *)(ext+1);
|
|
|
|
len = ntohs(e.len) - 4;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK2(*vid, len);
|
2007-08-29 10:38:14 +08:00
|
|
|
for(i=0; i<len; i++) {
|
2017-12-01 22:19:56 +08:00
|
|
|
if(ND_ISPRINT(EXTRACT_U_1(vid + i)))
|
|
|
|
ND_PRINT((ndo, "%c", EXTRACT_U_1(vid + i)));
|
2009-05-25 05:06:10 +08:00
|
|
|
else ND_PRINT((ndo, "."));
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
2007-08-29 20:31:00 +08:00
|
|
|
if (2 < ndo->ndo_vflag && 4 < len) {
|
2017-08-24 12:08:42 +08:00
|
|
|
/* Print the entire payload in hex */
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
|
2007-08-29 10:38:14 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
2015-04-27 08:24:42 +08:00
|
|
|
return (const u_char *)ext + ntohs(e.len);
|
2007-08-29 10:38:14 +08:00
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_TS_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2008-02-06 03:34:25 +08:00
|
|
|
ikev2_e_print(netdissect_options *ndo,
|
|
|
|
#ifndef HAVE_LIBCRYPTO
|
|
|
|
_U_
|
|
|
|
#endif
|
|
|
|
struct isakmp *base,
|
2014-01-02 10:27:54 +08:00
|
|
|
u_char tpay,
|
2008-02-06 03:34:25 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
|
|
|
#ifndef HAVE_LIBCRYPTO
|
|
|
|
_U_
|
|
|
|
#endif
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase,
|
2008-02-06 03:34:25 +08:00
|
|
|
#ifndef HAVE_LIBCRYPTO
|
|
|
|
_U_
|
|
|
|
#endif
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t doi,
|
2008-02-06 03:34:25 +08:00
|
|
|
#ifndef HAVE_LIBCRYPTO
|
|
|
|
_U_
|
|
|
|
#endif
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t proto,
|
2008-02-06 03:34:25 +08:00
|
|
|
#ifndef HAVE_LIBCRYPTO
|
|
|
|
_U_
|
|
|
|
#endif
|
|
|
|
int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
2007-11-23 05:53:43 +08:00
|
|
|
struct isakmp_gen e;
|
2015-04-27 08:24:42 +08:00
|
|
|
const u_char *dat;
|
2007-11-25 02:13:33 +08:00
|
|
|
volatile int dlen;
|
2007-11-23 05:53:43 +08:00
|
|
|
|
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-11-23 05:53:43 +08:00
|
|
|
ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
|
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
dlen = ntohs(e.len)-4;
|
|
|
|
|
|
|
|
ND_PRINT((ndo," len=%d", dlen));
|
|
|
|
if (2 < ndo->ndo_vflag && 4 < dlen) {
|
2007-11-23 05:53:43 +08:00
|
|
|
ND_PRINT((ndo," "));
|
2015-04-27 08:24:42 +08:00
|
|
|
if (!rawprint(ndo, (const uint8_t *)(ext + 1), dlen))
|
2007-11-23 05:53:43 +08:00
|
|
|
goto trunc;
|
|
|
|
}
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
dat = (const u_char *)(ext+1);
|
2007-11-25 02:13:33 +08:00
|
|
|
ND_TCHECK2(*dat, dlen);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2008-01-25 03:57:46 +08:00
|
|
|
#ifdef HAVE_LIBCRYPTO
|
2007-11-25 02:13:33 +08:00
|
|
|
/* try to decypt it! */
|
|
|
|
if(esp_print_decrypt_buffer_by_ikev2(ndo,
|
|
|
|
base->flags & ISAKMP_FLAG_I,
|
|
|
|
base->i_ck, base->r_ck,
|
|
|
|
dat, dat+dlen)) {
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
ext = (const struct isakmp_gen *)ndo->ndo_packetp;
|
|
|
|
|
|
|
|
/* got it decrypted, print stuff inside. */
|
|
|
|
ikev2_sub_print(ndo, base, e.np, ext, ndo->ndo_snapend,
|
|
|
|
phase, doi, proto, depth+1);
|
|
|
|
}
|
2008-01-25 03:57:46 +08:00
|
|
|
#endif
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-11-25 02:13:33 +08:00
|
|
|
|
2007-11-23 05:53:43 +08:00
|
|
|
/* always return NULL, because E must be at end, and NP refers
|
|
|
|
* to what was inside.
|
|
|
|
*/
|
|
|
|
return NULL;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
|
|
|
|
return NULL;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_cp_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2014-01-02 10:27:54 +08:00
|
|
|
ikev2_eap_print(netdissect_options *ndo, u_char tpay,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext,
|
|
|
|
u_int item_len _U_, const u_char *ep _U_,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase _U_, uint32_t doi _U_,
|
|
|
|
uint32_t proto _U_, int depth _U_)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
return ikev2_gen_print(ndo, tpay, ext);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
|
|
|
ike_sub0_print(netdissect_options *ndo,
|
|
|
|
u_char np, const struct isakmp_gen *ext, const u_char *ep,
|
2007-11-23 05:53:43 +08:00
|
|
|
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const u_char *cp;
|
|
|
|
struct isakmp_gen e;
|
|
|
|
u_int item_len;
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Since we can't have a payload length of less than 4 bytes,
|
|
|
|
* we need to bail out here if the generic header is nonsensical
|
|
|
|
* or truncated, otherwise we could loop forever processing
|
|
|
|
* zero-length items or otherwise misdissect the packet.
|
|
|
|
*/
|
|
|
|
item_len = ntohs(e.len);
|
|
|
|
if (item_len <= 4)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (NPFUNC(np)) {
|
|
|
|
/*
|
|
|
|
* XXX - what if item_len is too short, or too long,
|
|
|
|
* for this payload type?
|
|
|
|
*/
|
|
|
|
cp = (*npfunc[np])(ndo, np, ext, item_len, ep, phase, doi, proto, depth);
|
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo,"%s", NPSTR(np)));
|
|
|
|
cp += item_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cp;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|isakmp]"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
|
|
|
ikev1_sub_print(netdissect_options *ndo,
|
|
|
|
u_char np, const struct isakmp_gen *ext, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const u_char *cp;
|
|
|
|
int i;
|
|
|
|
struct isakmp_gen e;
|
|
|
|
|
|
|
|
cp = (const u_char *)ext;
|
|
|
|
|
|
|
|
while (np) {
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK2(*ext, ntohs(e.len));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
depth++;
|
|
|
|
ND_PRINT((ndo,"\n"));
|
|
|
|
for (i = 0; i < depth; i++)
|
|
|
|
ND_PRINT((ndo," "));
|
|
|
|
ND_PRINT((ndo,"("));
|
|
|
|
cp = ike_sub0_print(ndo, np, ext, ep, phase, doi, proto, depth);
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
depth--;
|
|
|
|
|
|
|
|
if (cp == NULL) {
|
|
|
|
/* Zero-length subitem */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
np = e.np;
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)cp;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
return cp;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(np)));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
|
|
|
numstr(int x)
|
|
|
|
{
|
|
|
|
static char buf[20];
|
|
|
|
snprintf(buf, sizeof(buf), "#%d", x);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
|
2009-06-10 08:18:31 +08:00
|
|
|
static void
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev1_print(netdissect_options *ndo,
|
|
|
|
const u_char *bp, u_int length,
|
|
|
|
const u_char *bp2, struct isakmp *base)
|
|
|
|
{
|
|
|
|
const struct isakmp *p;
|
|
|
|
const u_char *ep;
|
|
|
|
u_char np;
|
|
|
|
int i;
|
|
|
|
int phase;
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
p = (const struct isakmp *)bp;
|
|
|
|
ep = ndo->ndo_snapend;
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2017-11-23 06:54:09 +08:00
|
|
|
phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
|
2007-08-29 10:38:14 +08:00
|
|
|
if (phase == 1)
|
|
|
|
ND_PRINT((ndo," phase %d", phase));
|
|
|
|
else
|
|
|
|
ND_PRINT((ndo," phase %d/others", phase));
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
i = cookie_find(&base->i_ck);
|
|
|
|
if (i < 0) {
|
2015-04-27 08:24:42 +08:00
|
|
|
if (iszero((const u_char *)&base->r_ck, sizeof(base->r_ck))) {
|
2007-08-29 10:38:14 +08:00
|
|
|
/* the first packet */
|
|
|
|
ND_PRINT((ndo," I"));
|
|
|
|
if (bp2)
|
|
|
|
cookie_record(&base->i_ck, bp2);
|
|
|
|
} else
|
|
|
|
ND_PRINT((ndo," ?"));
|
|
|
|
} else {
|
|
|
|
if (bp2 && cookie_isinitiator(i, bp2))
|
|
|
|
ND_PRINT((ndo," I"));
|
|
|
|
else if (bp2 && cookie_isresponder(i, bp2))
|
|
|
|
ND_PRINT((ndo," R"));
|
|
|
|
else
|
|
|
|
ND_PRINT((ndo," ?"));
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo," %s", ETYPESTR(base->etype)));
|
|
|
|
if (base->flags) {
|
|
|
|
ND_PRINT((ndo,"[%s%s]", base->flags & ISAKMP_FLAG_E ? "E" : "",
|
|
|
|
base->flags & ISAKMP_FLAG_C ? "C" : ""));
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext;
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,":"));
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
/* regardless of phase... */
|
|
|
|
if (base->flags & ISAKMP_FLAG_E) {
|
|
|
|
/*
|
|
|
|
* encrypted, nothing we can do right now.
|
|
|
|
* we hope to decrypt the packet in the future...
|
|
|
|
*/
|
|
|
|
ND_PRINT((ndo," [encrypted %s]", NPSTR(base->np)));
|
|
|
|
goto done;
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
CHECKLEN(p + 1, base->np);
|
|
|
|
np = base->np;
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)(p + 1);
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev1_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);
|
|
|
|
}
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
done:
|
2007-08-29 20:31:00 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
2007-08-29 10:38:14 +08:00
|
|
|
if (ntohl(base->len) != length) {
|
|
|
|
ND_PRINT((ndo," (len mismatch: isakmp %u/ip %u)",
|
2014-04-23 15:20:40 +08:00
|
|
|
(uint32_t)ntohl(base->len), length));
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
2007-11-25 02:13:33 +08:00
|
|
|
ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base,
|
2017-01-16 05:49:26 +08:00
|
|
|
u_char np,
|
2007-08-29 10:38:14 +08:00
|
|
|
const struct isakmp_gen *ext, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const u_char *cp;
|
|
|
|
struct isakmp_gen e;
|
|
|
|
u_int item_len;
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
cp = (const u_char *)ext;
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Since we can't have a payload length of less than 4 bytes,
|
|
|
|
* we need to bail out here if the generic header is nonsensical
|
|
|
|
* or truncated, otherwise we could loop forever processing
|
|
|
|
* zero-length items or otherwise misdissect the packet.
|
|
|
|
*/
|
|
|
|
item_len = ntohs(e.len);
|
|
|
|
if (item_len <= 4)
|
|
|
|
return NULL;
|
|
|
|
|
2017-01-16 05:49:26 +08:00
|
|
|
if (np == ISAKMP_NPTYPE_v2E) {
|
2007-11-25 02:13:33 +08:00
|
|
|
cp = ikev2_e_print(ndo, base, np, ext, item_len,
|
|
|
|
ep, phase, doi, proto, depth);
|
2007-08-29 10:38:14 +08:00
|
|
|
} else if (NPFUNC(np)) {
|
|
|
|
/*
|
|
|
|
* XXX - what if item_len is too short, or too long,
|
|
|
|
* for this payload type?
|
|
|
|
*/
|
2017-01-16 05:49:26 +08:00
|
|
|
cp = (*npfunc[np])(ndo, np, ext, item_len,
|
2007-08-29 10:38:14 +08:00
|
|
|
ep, phase, doi, proto, depth);
|
|
|
|
} else {
|
|
|
|
ND_PRINT((ndo,"%s", NPSTR(np)));
|
|
|
|
cp += item_len;
|
|
|
|
}
|
|
|
|
|
|
|
|
return cp;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|isakmp]"));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const u_char *
|
|
|
|
ikev2_sub_print(netdissect_options *ndo,
|
2007-11-25 02:13:33 +08:00
|
|
|
struct isakmp *base,
|
2007-08-29 10:38:14 +08:00
|
|
|
u_char np, const struct isakmp_gen *ext, const u_char *ep,
|
2014-04-23 15:20:40 +08:00
|
|
|
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const u_char *cp;
|
|
|
|
int i;
|
|
|
|
struct isakmp_gen e;
|
|
|
|
|
|
|
|
cp = (const u_char *)ext;
|
|
|
|
while (np) {
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK(*ext);
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&e, ext, sizeof(e));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
2007-08-29 20:31:00 +08:00
|
|
|
ND_TCHECK2(*ext, ntohs(e.len));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
depth++;
|
|
|
|
ND_PRINT((ndo,"\n"));
|
|
|
|
for (i = 0; i < depth; i++)
|
|
|
|
ND_PRINT((ndo," "));
|
|
|
|
ND_PRINT((ndo,"("));
|
2017-01-16 05:49:26 +08:00
|
|
|
cp = ikev2_sub0_print(ndo, base, np,
|
2007-08-29 10:38:14 +08:00
|
|
|
ext, ep, phase, doi, proto, depth);
|
|
|
|
ND_PRINT((ndo,")"));
|
|
|
|
depth--;
|
|
|
|
|
|
|
|
if (cp == NULL) {
|
|
|
|
/* Zero-length subitem */
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
np = e.np;
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)cp;
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
return cp;
|
|
|
|
trunc:
|
|
|
|
ND_PRINT((ndo," [|%s]", NPSTR(np)));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-08-29 10:58:43 +08:00
|
|
|
static void
|
2007-08-29 10:38:14 +08:00
|
|
|
ikev2_print(netdissect_options *ndo,
|
|
|
|
const u_char *bp, u_int length,
|
2007-08-29 10:58:43 +08:00
|
|
|
const u_char *bp2 _U_, struct isakmp *base)
|
2007-08-29 10:38:14 +08:00
|
|
|
{
|
|
|
|
const struct isakmp *p;
|
|
|
|
const u_char *ep;
|
|
|
|
u_char np;
|
|
|
|
int phase;
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
p = (const struct isakmp *)bp;
|
|
|
|
ep = ndo->ndo_snapend;
|
|
|
|
|
2017-11-23 06:54:09 +08:00
|
|
|
phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
|
2007-08-29 10:38:14 +08:00
|
|
|
if (phase == 1)
|
|
|
|
ND_PRINT((ndo, " parent_sa"));
|
|
|
|
else
|
|
|
|
ND_PRINT((ndo, " child_sa "));
|
|
|
|
|
|
|
|
ND_PRINT((ndo, " %s", ETYPESTR(base->etype)));
|
|
|
|
if (base->flags) {
|
2009-05-25 05:06:10 +08:00
|
|
|
ND_PRINT((ndo, "[%s%s%s]",
|
2007-08-29 10:38:14 +08:00
|
|
|
base->flags & ISAKMP_FLAG_I ? "I" : "",
|
|
|
|
base->flags & ISAKMP_FLAG_V ? "V" : "",
|
|
|
|
base->flags & ISAKMP_FLAG_R ? "R" : ""));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
const struct isakmp_gen *ext;
|
|
|
|
|
|
|
|
ND_PRINT((ndo, ":"));
|
2003-12-20 18:03:19 +08:00
|
|
|
|
2003-12-20 17:58:10 +08:00
|
|
|
/* regardless of phase... */
|
2007-08-29 10:38:14 +08:00
|
|
|
if (base->flags & ISAKMP_FLAG_E) {
|
2003-12-20 17:58:10 +08:00
|
|
|
/*
|
|
|
|
* encrypted, nothing we can do right now.
|
|
|
|
* we hope to decrypt the packet in the future...
|
|
|
|
*/
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo, " [encrypted %s]", NPSTR(base->np)));
|
2003-12-20 17:58:10 +08:00
|
|
|
goto done;
|
|
|
|
}
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
CHECKLEN(p + 1, base->np)
|
1999-10-30 13:11:06 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
np = base->np;
|
2015-04-27 08:24:42 +08:00
|
|
|
ext = (const struct isakmp_gen *)(p + 1);
|
2007-11-25 02:13:33 +08:00
|
|
|
ikev2_sub_print(ndo, base, np, ext, ep, phase, 0, 0, 0);
|
2003-12-20 17:58:10 +08:00
|
|
|
}
|
1999-10-18 05:59:12 +08:00
|
|
|
|
1999-10-30 13:11:06 +08:00
|
|
|
done:
|
2007-08-29 10:38:14 +08:00
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
if (ntohl(base->len) != length) {
|
|
|
|
ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",
|
2014-04-23 15:20:40 +08:00
|
|
|
(uint32_t)ntohl(base->len), length));
|
1999-10-30 13:11:06 +08:00
|
|
|
}
|
|
|
|
}
|
1999-10-18 05:59:12 +08:00
|
|
|
}
|
2005-04-07 05:33:27 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
void
|
|
|
|
isakmp_print(netdissect_options *ndo,
|
|
|
|
const u_char *bp, u_int length,
|
|
|
|
const u_char *bp2)
|
|
|
|
{
|
|
|
|
const struct isakmp *p;
|
|
|
|
struct isakmp base;
|
|
|
|
const u_char *ep;
|
|
|
|
int major, minor;
|
|
|
|
|
2008-01-25 03:57:46 +08:00
|
|
|
#ifdef HAVE_LIBCRYPTO
|
|
|
|
/* initialize SAs */
|
2007-11-25 02:13:33 +08:00
|
|
|
if (ndo->ndo_sa_list_head == NULL) {
|
|
|
|
if (ndo->ndo_espsecret)
|
|
|
|
esp_print_decodesecret(ndo);
|
|
|
|
}
|
2008-01-25 03:57:46 +08:00
|
|
|
#endif
|
2007-11-25 02:13:33 +08:00
|
|
|
|
2007-08-29 10:38:14 +08:00
|
|
|
p = (const struct isakmp *)bp;
|
|
|
|
ep = ndo->ndo_snapend;
|
|
|
|
|
2015-04-27 08:24:42 +08:00
|
|
|
if ((const struct isakmp *)ep < p + 1) {
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"[|isakmp]"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-01-18 09:51:04 +08:00
|
|
|
UNALIGNED_MEMCPY(&base, p, sizeof(base));
|
2007-08-29 10:38:14 +08:00
|
|
|
|
|
|
|
ND_PRINT((ndo,"isakmp"));
|
|
|
|
major = (base.vers & ISAKMP_VERS_MAJOR)
|
|
|
|
>> ISAKMP_VERS_MAJOR_SHIFT;
|
|
|
|
minor = (base.vers & ISAKMP_VERS_MINOR)
|
|
|
|
>> ISAKMP_VERS_MINOR_SHIFT;
|
|
|
|
|
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo," %d.%d", major, minor));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo," msgid "));
|
2015-04-27 08:24:42 +08:00
|
|
|
hexprint(ndo, (const uint8_t *)&base.msgid, sizeof(base.msgid));
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (1 < ndo->ndo_vflag) {
|
|
|
|
ND_PRINT((ndo," cookie "));
|
2015-04-27 08:24:42 +08:00
|
|
|
hexprint(ndo, (const uint8_t *)&base.i_ck, sizeof(base.i_ck));
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"->"));
|
2015-04-27 08:24:42 +08:00
|
|
|
hexprint(ndo, (const uint8_t *)&base.r_ck, sizeof(base.r_ck));
|
2007-08-29 10:38:14 +08:00
|
|
|
}
|
|
|
|
ND_PRINT((ndo,":"));
|
|
|
|
|
|
|
|
switch(major) {
|
|
|
|
case IKEv1_MAJOR_VERSION:
|
|
|
|
ikev1_print(ndo, bp, length, bp2, &base);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case IKEv2_MAJOR_VERSION:
|
|
|
|
ikev2_print(ndo, bp, length, bp2, &base);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-04-07 05:33:27 +08:00
|
|
|
void
|
|
|
|
isakmp_rfc3948_print(netdissect_options *ndo,
|
|
|
|
const u_char *bp, u_int length,
|
|
|
|
const u_char *bp2)
|
|
|
|
{
|
2017-12-04 01:18:58 +08:00
|
|
|
ND_TCHECK_1(bp);
|
2017-12-02 21:19:13 +08:00
|
|
|
if(length == 1 && EXTRACT_U_1(bp)==0xff) {
|
2005-04-07 05:33:27 +08:00
|
|
|
ND_PRINT((ndo, "isakmp-nat-keep-alive"));
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-04-07 08:28:17 +08:00
|
|
|
if(length < 4) {
|
|
|
|
goto trunc;
|
|
|
|
}
|
2017-12-04 01:18:58 +08:00
|
|
|
ND_TCHECK_1(bp + 3);
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2005-04-07 05:33:27 +08:00
|
|
|
/*
|
|
|
|
* see if this is an IKE packet
|
|
|
|
*/
|
2017-12-02 21:19:13 +08:00
|
|
|
if (EXTRACT_U_1(bp) == 0 && EXTRACT_U_1(bp + 1) == 0 &&
|
|
|
|
EXTRACT_U_1(bp + 2) == 0 && EXTRACT_U_1(bp + 3) == 0) {
|
2005-04-07 08:28:17 +08:00
|
|
|
ND_PRINT((ndo, "NONESP-encap: "));
|
2005-04-07 05:33:27 +08:00
|
|
|
isakmp_print(ndo, bp+4, length-4, bp2);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* must be an ESP packet */
|
|
|
|
{
|
2017-11-23 02:15:49 +08:00
|
|
|
u_int nh, enh, padlen;
|
2005-04-07 05:33:27 +08:00
|
|
|
int advance;
|
|
|
|
|
2005-04-07 08:28:17 +08:00
|
|
|
ND_PRINT((ndo, "UDP-encap: "));
|
|
|
|
|
2005-04-07 05:33:27 +08:00
|
|
|
advance = esp_print(ndo, bp, length, bp2, &enh, &padlen);
|
|
|
|
if(advance <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
bp += advance;
|
|
|
|
length -= advance + padlen;
|
|
|
|
nh = enh & 0xff;
|
2014-01-02 10:27:54 +08:00
|
|
|
|
2005-04-07 08:28:17 +08:00
|
|
|
ip_print_inner(ndo, bp, length, nh, bp2);
|
2005-04-07 05:33:27 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
trunc:
|
2007-08-29 10:38:14 +08:00
|
|
|
ND_PRINT((ndo,"[|isakmp]"));
|
2005-04-07 05:33:27 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2005-04-07 08:28:17 +08:00
|
|
|
/*
|
|
|
|
* Local Variables:
|
|
|
|
* c-style: whitesmith
|
|
|
|
* c-basic-offset: 8
|
|
|
|
* End:
|
|
|
|
*/
|