/* \summary: Internet Security Association and Key Management Protocol (ISAKMP) printer */
+/* specification: RFC 2407, RFC 2408, RFC 5996 */
+
#ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
#endif
/* The functions from print-esp.c used in this file are only defined when both
#undef HAVE_LIBCRYPTO
#endif
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
#include <string.h>
#include "ip.h"
#include "ip6.h"
+#include "ipproto.h"
-/* refer to RFC 2408 */
-
-typedef u_char cookie_t[8];
-typedef u_char msgid_t[4];
+typedef nd_byte cookie_t[8];
+typedef nd_byte msgid_t[4];
#define PORT_ISAKMP 500
struct isakmp {
cookie_t i_ck; /* Initiator Cookie */
cookie_t r_ck; /* Responder Cookie */
- uint8_t np; /* Next Payload Type */
- uint8_t vers;
+ nd_uint8_t np; /* Next Payload Type */
+ nd_uint8_t vers;
#define ISAKMP_VERS_MAJOR 0xf0
#define ISAKMP_VERS_MAJOR_SHIFT 4
#define ISAKMP_VERS_MINOR 0x0f
#define ISAKMP_VERS_MINOR_SHIFT 0
- uint8_t etype; /* Exchange Type */
- uint8_t flags; /* Flags */
+ nd_uint8_t etype; /* Exchange Type */
+ nd_uint8_t flags; /* Flags */
msgid_t msgid;
- uint32_t len; /* Length */
+ nd_uint32_t len; /* Length */
};
/* Next Payload Type */
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct isakmp_gen {
- uint8_t np; /* Next Payload */
- uint8_t critical; /* bit 7 - critical, rest is RESERVED */
- uint16_t len; /* Payload Length */
+ nd_uint8_t np; /* Next Payload */
+ nd_uint8_t critical; /* bit 7 - critical, rest is RESERVED */
+ nd_uint16_t len; /* Payload Length */
};
/* 3.3 Data Attributes
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
*/
struct isakmp_data {
- uint16_t type; /* defined by DOI-spec, and Attribute Format */
- uint16_t lorv; /* if f equal 1, Attribute Length */
- /* if f equal 0, Attribute Value */
+ nd_uint16_t type; /* defined by DOI-spec, and Attribute Format */
+ nd_uint16_t lorv; /* if f equal 1, Attribute Length */
+ /* if f equal 0, Attribute Value */
/* if f equal 1, Attribute Value */
};
*/
struct ikev1_pl_sa {
struct isakmp_gen h;
- uint32_t doi; /* Domain of Interpretation */
- uint32_t sit; /* Situation */
+ nd_uint32_t doi; /* Domain of Interpretation */
+ nd_uint32_t sit; /* Situation */
};
/* 3.5 Proposal Payload */
*/
struct ikev1_pl_p {
struct isakmp_gen h;
- uint8_t p_no; /* Proposal # */
- uint8_t prot_id; /* Protocol */
- uint8_t spi_size; /* SPI Size */
- uint8_t num_t; /* Number of Transforms */
+ nd_uint8_t p_no; /* Proposal # */
+ nd_uint8_t prot_id; /* Protocol */
+ nd_uint8_t spi_size; /* SPI Size */
+ nd_uint8_t num_t; /* Number of Transforms */
/* SPI */
};
*/
struct ikev1_pl_t {
struct isakmp_gen h;
- uint8_t t_no; /* Transform # */
- uint8_t t_id; /* Transform-Id */
- uint16_t reserved; /* RESERVED2 */
+ nd_uint8_t t_no; /* Transform # */
+ nd_uint8_t t_id; /* Transform-Id */
+ nd_byte reserved[2]; /* RESERVED2 */
/* SA Attributes */
};
struct ikev1_pl_id {
struct isakmp_gen h;
union {
- uint8_t id_type; /* ID Type */
- uint32_t doi_data; /* DOI Specific ID Data */
+ nd_uint8_t id_type; /* ID Type */
+ nd_uint32_t doi_data; /* DOI Specific ID Data */
} d;
/* Identification Data */
};
/* 3.9 Certificate Payload */
struct ikev1_pl_cert {
struct isakmp_gen h;
- uint8_t encode; /* Cert Encoding */
- char cert; /* Certificate Data */
+ nd_uint8_t encode; /* Cert Encoding */
+ nd_uint8_t cert; /* Certificate Data */
/*
This field indicates the type of
certificate or certificate-related information contained in the
/* 3.10 Certificate Request Payload */
struct ikev1_pl_cr {
struct isakmp_gen h;
- uint8_t num_cert; /* # Cert. Types */
+ nd_uint8_t num_cert; /* # Cert. Types */
/*
Certificate Types (variable length)
-- Contains a list of the types of certificates requested,
/* 3.14 Notification Payload */
struct ikev1_pl_n {
struct isakmp_gen h;
- uint32_t doi; /* Domain of Interpretation */
- uint8_t prot_id; /* Protocol-ID */
- uint8_t spi_size; /* SPI Size */
- uint16_t type; /* Notify Message Type */
+ nd_uint32_t doi; /* Domain of Interpretation */
+ nd_uint8_t prot_id; /* Protocol-ID */
+ nd_uint8_t spi_size; /* SPI Size */
+ nd_uint16_t type; /* Notify Message Type */
/* SPI */
/* Notification Data */
};
/* 3.15 Delete Payload */
struct ikev1_pl_d {
struct isakmp_gen h;
- uint32_t doi; /* Domain of Interpretation */
- uint8_t prot_id; /* Protocol-Id */
- uint8_t spi_size; /* SPI Size */
- uint16_t num_spi; /* # of SPIs */
+ nd_uint32_t doi; /* Domain of Interpretation */
+ nd_uint8_t prot_id; /* Protocol-Id */
+ nd_uint8_t spi_size; /* SPI Size */
+ nd_uint16_t num_spi; /* # of SPIs */
/* 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;
- uint8_t p_no; /* Proposal # */
- uint8_t prot_id; /* Protocol */
- uint8_t spi_size; /* SPI Size */
- uint8_t num_t; /* Number of Transforms */
+ nd_uint8_t p_no; /* Proposal # */
+ nd_uint8_t prot_id; /* Protocol */
+ nd_uint8_t spi_size; /* SPI Size */
+ nd_uint8_t num_t; /* Number of Transforms */
};
/* 3.3.2. Transform Substructure */
struct ikev2_t {
struct isakmp_gen h;
- uint8_t t_type; /* Transform Type (ENCR,PRF,INTEG,etc.*/
- uint8_t res2; /* reserved byte */
- uint16_t t_id; /* Transform ID */
+ nd_uint8_t t_type; /* Transform Type (ENCR,PRF,INTEG,etc.*/
+ nd_byte res2; /* reserved byte */
+ nd_uint16_t t_id; /* Transform ID */
};
enum ikev2_t_type {
/* 3.4. Key Exchange Payload */
struct ikev2_ke {
struct isakmp_gen h;
- uint16_t ke_group;
- uint16_t ke_res1;
+ nd_uint16_t ke_group;
+ nd_uint16_t ke_res1;
/* KE data */
};
};
struct ikev2_id {
struct isakmp_gen h;
- uint8_t type; /* ID type */
- uint8_t res1;
- uint16_t res2;
+ nd_uint8_t type; /* ID type */
+ nd_byte res1;
+ nd_byte res2[2];
/* SPI */
/* Notification Data */
};
/* 3.10 Notification Payload */
struct ikev2_n {
struct isakmp_gen h;
- uint8_t prot_id; /* Protocol-ID */
- uint8_t spi_size; /* SPI Size */
- uint16_t type; /* Notify Message Type */
+ nd_uint8_t prot_id; /* Protocol-ID */
+ nd_uint8_t spi_size; /* SPI Size */
+ nd_uint16_t type; /* Notify Message Type */
};
enum ikev2_n_type {
char *msg;
};
-/* 3.8 Notification Payload */
+/* 3.8 Authentication Payload */
struct ikev2_auth {
struct isakmp_gen h;
- uint8_t auth_method; /* Protocol-ID */
- uint8_t reserved[3];
+ nd_uint8_t auth_method; /* Protocol-ID */
+ nd_byte reserved[3];
/* authentication data */
};
/* 4.6.1 Security Association Payload */
struct ipsecdoi_sa {
struct isakmp_gen h;
- uint32_t doi; /* Domain of Interpretation */
- uint32_t sit; /* Situation */
+ nd_uint32_t doi; /* Domain of Interpretation */
+ nd_uint32_t sit; /* Situation */
};
struct ipsecdoi_secrecy_h {
- uint16_t len;
- uint16_t reserved;
+ nd_uint16_t len;
+ nd_uint16_t reserved;
};
/* 4.6.2.1 Identification Type Values */
struct ipsecdoi_id {
struct isakmp_gen h;
- uint8_t type; /* ID Type */
- uint8_t proto_id; /* Protocol ID */
- uint16_t port; /* Port */
+ nd_uint8_t type; /* ID Type */
+ nd_uint8_t proto_id; /* Protocol ID */
+ nd_uint16_t port; /* Port */
/* Identification Data */
};
DECLARE_PRINTER(v2_eap);
static const u_char *ikev2_e_print(netdissect_options *ndo,
- struct isakmp *base,
+ const struct isakmp *base,
u_char tpay,
const struct isakmp_gen *ext,
u_int item_len,
const u_char *, uint32_t, uint32_t, uint32_t, int);
static const u_char *ikev2_sub_print(netdissect_options *ndo,
- struct isakmp *base,
+ const struct isakmp *base,
u_char np, const struct isakmp_gen *ext,
const u_char *ep, uint32_t phase,
uint32_t doi, uint32_t proto,
int depth);
-static char *numstr(int);
+static char *numstr(u_int);
static void
ikev1_print(netdissect_options *ndo,
const u_char *bp, u_int length,
- const u_char *bp2, struct isakmp *base);
+ const u_char *bp2, const struct isakmp *base);
#define MAXINITIATORS 20
-int ninitiator = 0;
+static int ninitiator = 0;
union inaddr_u {
struct in_addr in4;
struct in6_addr in6;
};
-struct {
+static struct {
cookie_t initiator;
u_int version;
union inaddr_u iaddr;
#define CHECKLEN(p, np) \
if (ep < (const u_char *)(p)) { \
- ND_PRINT((ndo," [|%s]", NPSTR(np))); \
+ ND_PRINT(" [|%s]", NPSTR(np)); \
goto done; \
}
static int
iszero(const u_char *p, size_t l)
{
- while (l--) {
- if (*p++)
+ while (l != 0) {
+ if (*p)
return 0;
+ p++;
+ l--;
}
return 1;
}
/* find cookie from initiator cache */
static int
-cookie_find(cookie_t *in)
+cookie_find(const cookie_t *in)
{
int i;
/* record initiator */
static void
-cookie_record(cookie_t *in, const u_char *bp2)
+cookie_record(netdissect_options *ndo, const cookie_t *in, const u_char *bp2)
{
int i;
const struct ip *ip;
switch (IP_V(ip)) {
case 4:
cookiecache[ninitiator].version = 4;
- 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));
+ UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in4,
+ ip->ip_src, sizeof(nd_ipv4));
+ UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in4,
+ ip->ip_dst, sizeof(nd_ipv4));
break;
case 6:
ip6 = (const struct ip6_hdr *)bp2;
cookiecache[ninitiator].version = 6;
- 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));
+ UNALIGNED_MEMCPY(&cookiecache[ninitiator].iaddr.in6,
+ ip6->ip6_src, sizeof(nd_ipv6));
+ UNALIGNED_MEMCPY(&cookiecache[ninitiator].raddr.in6,
+ ip6->ip6_dst, sizeof(nd_ipv6));
break;
default:
return;
ninitiator = (ninitiator + 1) % MAXINITIATORS;
}
-#define cookie_isinitiator(x, y) cookie_sidecheck((x), (y), 1)
-#define cookie_isresponder(x, y) cookie_sidecheck((x), (y), 0)
+#define cookie_isinitiator(ndo, x, y) cookie_sidecheck(ndo, (x), (y), 1)
+#define cookie_isresponder(ndo, x, y) cookie_sidecheck(ndo, (x), (y), 0)
static int
-cookie_sidecheck(int i, const u_char *bp2, int initiator)
+cookie_sidecheck(netdissect_options *ndo, int i, const u_char *bp2, int initiator)
{
const struct ip *ip;
const struct ip6_hdr *ip6;
if (cookiecache[i].version != 4)
return 0;
if (initiator) {
- if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].iaddr.in4, sizeof(struct in_addr)) == 0)
+ if (UNALIGNED_MEMCMP(ip->ip_src, &cookiecache[i].iaddr.in4, sizeof(nd_ipv4)) == 0)
return 1;
} else {
- if (UNALIGNED_MEMCMP(&ip->ip_src, &cookiecache[i].raddr.in4, sizeof(struct in_addr)) == 0)
+ if (UNALIGNED_MEMCMP(ip->ip_src, &cookiecache[i].raddr.in4, sizeof(nd_ipv4)) == 0)
return 1;
}
break;
return 0;
ip6 = (const struct ip6_hdr *)bp2;
if (initiator) {
- if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(struct in6_addr)) == 0)
+ if (UNALIGNED_MEMCMP(ip6->ip6_src, &cookiecache[i].iaddr.in6, sizeof(nd_ipv6)) == 0)
return 1;
} else {
- if (UNALIGNED_MEMCMP(&ip6->ip6_src, &cookiecache[i].raddr.in6, sizeof(struct in6_addr)) == 0)
+ if (UNALIGNED_MEMCMP(ip6->ip6_src, &cookiecache[i].raddr.in6, sizeof(nd_ipv6)) == 0)
return 1;
}
break;
p = loc;
for (i = 0; i < len; i++)
- ND_PRINT((ndo,"%02x", p[i] & 0xff));
+ ND_PRINT("%02x", p[i] & 0xff);
}
static int
rawprint(netdissect_options *ndo, const uint8_t *loc, size_t len)
{
- ND_TCHECK2(*loc, len);
+ ND_TCHECK_LEN(loc, len);
hexprint(ndo, loc, len);
return 1;
{
/* there is too much data, just show some of it */
const u_char *end = ep - 20;
- int elen = 20;
- int len = ep - cp;
+ size_t elen = 20;
+ size_t len = ep - cp;
if(len > 10) {
len = 10;
}
elen = ep - end;
}
- ND_PRINT((ndo," data=("));
+ ND_PRINT(" data=(");
if(!rawprint(ndo, (const uint8_t *)(cp), len)) goto trunc;
- ND_PRINT((ndo, "..."));
+ ND_PRINT("...");
if(elen) {
if(!rawprint(ndo, (const uint8_t *)(end), elen)) goto trunc;
}
- ND_PRINT((ndo,")"));
+ ND_PRINT(")");
return 1;
trunc:
static const u_char *
ikev1_attrmap_print(netdissect_options *ndo,
- const u_char *p, const u_char *ep,
+ const u_char *p, const u_char *ep2,
const struct attrmap *map, size_t nmap)
{
- int totlen;
+ u_int totlen;
uint32_t t, v;
- if (p[0] & 0x80)
+ ND_TCHECK_1(p);
+ if (EXTRACT_U_1(p) & 0x80)
totlen = 4;
- else
- totlen = 4 + EXTRACT_16BITS(&p[2]);
- if (ep < p + totlen) {
- ND_PRINT((ndo,"[|attr]"));
- return ep + 1;
+ else {
+ ND_TCHECK_2(p + 2);
+ totlen = 4 + EXTRACT_BE_U_2(p + 2);
+ }
+ if (ep2 < p + totlen) {
+ ND_PRINT("[|attr]");
+ return ep2 + 1;
}
- ND_PRINT((ndo,"("));
- t = EXTRACT_16BITS(&p[0]) & 0x7fff;
+ ND_TCHECK_2(p);
+ ND_PRINT("(");
+ t = EXTRACT_BE_U_2(p) & 0x7fff;
if (map && t < nmap && map[t].type)
- ND_PRINT((ndo,"type=%s ", map[t].type));
+ ND_PRINT("type=%s ", map[t].type);
else
- ND_PRINT((ndo,"type=#%d ", t));
- if (p[0] & 0x80) {
- ND_PRINT((ndo,"value="));
- v = EXTRACT_16BITS(&p[2]);
+ ND_PRINT("type=#%u ", t);
+ if (EXTRACT_U_1(p) & 0x80) {
+ ND_PRINT("value=");
+ ND_TCHECK_2(p + 2);
+ v = EXTRACT_BE_U_2(p + 2);
if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
- ND_PRINT((ndo,"%s", map[t].value[v]));
- else
- rawprint(ndo, (const uint8_t *)&p[2], 2);
+ ND_PRINT("%s", map[t].value[v]);
+ else {
+ if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {
+ ND_PRINT(")");
+ goto trunc;
+ }
+ }
} else {
- ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));
- rawprint(ndo, (const uint8_t *)&p[4], EXTRACT_16BITS(&p[2]));
+ ND_PRINT("len=%u value=", totlen - 4);
+ if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {
+ ND_PRINT(")");
+ goto trunc;
+ }
}
- ND_PRINT((ndo,")"));
+ ND_PRINT(")");
return p + totlen;
+
+trunc:
+ return NULL;
}
static const u_char *
-ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep)
+ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2)
{
- int totlen;
+ u_int totlen;
uint32_t t;
- if (p[0] & 0x80)
+ ND_TCHECK_1(p);
+ if (EXTRACT_U_1(p) & 0x80)
totlen = 4;
- else
- totlen = 4 + EXTRACT_16BITS(&p[2]);
- if (ep < p + totlen) {
- ND_PRINT((ndo,"[|attr]"));
- return ep + 1;
- }
-
- ND_PRINT((ndo,"("));
- t = EXTRACT_16BITS(&p[0]) & 0x7fff;
- ND_PRINT((ndo,"type=#%d ", t));
- if (p[0] & 0x80) {
- ND_PRINT((ndo,"value="));
- t = p[2];
- rawprint(ndo, (const uint8_t *)&p[2], 2);
+ else {
+ ND_TCHECK_2(p + 2);
+ totlen = 4 + EXTRACT_BE_U_2(p + 2);
+ }
+ if (ep2 < p + totlen) {
+ ND_PRINT("[|attr]");
+ return ep2 + 1;
+ }
+
+ ND_TCHECK_2(p);
+ ND_PRINT("(");
+ t = EXTRACT_BE_U_2(p) & 0x7fff;
+ ND_PRINT("type=#%u ", t);
+ if (EXTRACT_U_1(p) & 0x80) {
+ ND_PRINT("value=");
+ t = EXTRACT_U_1(p + 2);
+ if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) {
+ ND_PRINT(")");
+ goto trunc;
+ }
} else {
- ND_PRINT((ndo,"len=%d value=", EXTRACT_16BITS(&p[2])));
- rawprint(ndo, (const uint8_t *)&p[4], EXTRACT_16BITS(&p[2]));
+ ND_PRINT("len=%u value=", totlen - 4);
+ if (!rawprint(ndo, (const uint8_t *)(p + 4), totlen - 4)) {
+ ND_PRINT(")");
+ goto trunc;
+ }
}
- ND_PRINT((ndo,")"));
+ ND_PRINT(")");
return p + totlen;
+
+trunc:
+ return NULL;
}
static const u_char *
uint32_t proto0, int depth)
{
const struct ikev1_pl_sa *p;
- struct ikev1_pl_sa sa;
uint32_t doi, sit, ident;
const u_char *cp, *np;
int t;
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SA)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_SA));
p = (const struct ikev1_pl_sa *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&sa, ext, sizeof(sa));
- doi = ntohl(sa.doi);
- sit = ntohl(sa.sit);
+ ND_TCHECK_SIZE(p);
+ doi = EXTRACT_BE_U_4(p->doi);
+ sit = EXTRACT_BE_U_4(p->sit);
if (doi != 1) {
- ND_PRINT((ndo," doi=%d", doi));
- ND_PRINT((ndo," situation=%u", (uint32_t)ntohl(sa.sit)));
+ ND_PRINT(" doi=%u", doi);
+ ND_PRINT(" situation=%u", sit);
return (const u_char *)(p + 1);
}
- ND_PRINT((ndo," doi=ipsec"));
- ND_PRINT((ndo," situation="));
+ ND_PRINT(" doi=ipsec");
+ ND_PRINT(" situation=");
t = 0;
if (sit & 0x01) {
- ND_PRINT((ndo,"identity"));
+ ND_PRINT("identity");
t++;
}
if (sit & 0x02) {
- ND_PRINT((ndo,"%ssecrecy", t ? "+" : ""));
+ ND_PRINT("%ssecrecy", t ? "+" : "");
t++;
}
if (sit & 0x04)
- ND_PRINT((ndo,"%sintegrity", t ? "+" : ""));
+ ND_PRINT("%sintegrity", t ? "+" : "");
- np = (const u_char *)ext + sizeof(sa);
+ np = (const u_char *)ext + sizeof(struct ikev1_pl_sa);
if (sit != 0x01) {
- ND_TCHECK2(*(ext + 1), sizeof(ident));
- UNALIGNED_MEMCPY(&ident, ext + 1, sizeof(ident));
- ND_PRINT((ndo," ident=%u", (uint32_t)ntohl(ident)));
+ ND_TCHECK_4(ext + 1);
+ ident = EXTRACT_BE_U_4(ext + 1);
+ ND_PRINT(" ident=%u", ident);
np += sizeof(ident);
}
ext = (const struct isakmp_gen *)np;
- ND_TCHECK(*ext);
+ ND_TCHECK_SIZE(ext);
cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,
depth);
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SA)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_SA));
return NULL;
}
uint32_t proto0 _U_, int depth)
{
const struct ikev1_pl_p *p;
- struct ikev1_pl_p prop;
const u_char *cp;
+ uint8_t spi_size;
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_P)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_P));
p = (const struct ikev1_pl_p *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));
- ND_PRINT((ndo," #%d protoid=%s transform=%d",
- prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t));
- if (prop.spi_size) {
- ND_PRINT((ndo," spi="));
- if (!rawprint(ndo, (const uint8_t *)(p + 1), prop.spi_size))
+ ND_TCHECK_SIZE(p);
+ ND_PRINT(" #%u protoid=%s transform=%u",
+ EXTRACT_U_1(p->p_no), PROTOIDSTR(EXTRACT_U_1(p->prot_id)),
+ EXTRACT_U_1(p->num_t));
+ spi_size = EXTRACT_U_1(p->spi_size);
+ if (spi_size) {
+ ND_PRINT(" spi=");
+ if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
goto trunc;
}
- ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + prop.spi_size);
- ND_TCHECK(*ext);
+ ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + spi_size);
+ ND_TCHECK_SIZE(ext);
cp = ikev1_sub_print(ndo, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
- prop.prot_id, depth);
+ EXTRACT_U_1(p->prot_id), depth);
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_P));
return NULL;
}
};
static const struct attrmap encr_t_map[] = {
- { NULL, 0, { NULL } }, { NULL, 0, { NULL } }, /* 0, 1 */
+ { 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 */
static const struct attrmap oakley_t_map[] = {
{ NULL, 0, { NULL } },
{ "enc", 8, { NULL, "1des", "idea", "blowfish", "rc5",
- "3des", "cast", "aes", }, },
+ "3des", "cast", "aes", }, },
{ "hash", 7, { NULL, "md5", "sha1", "tiger",
"sha2-256", "sha2-384", "sha2-512", }, },
{ "auth", 6, { NULL, "preshared", "dss", "rsa sig", "rsa enc",
uint32_t proto, int depth _U_)
{
const struct ikev1_pl_t *p;
- struct ikev1_pl_t t;
const u_char *cp;
const char *idstr;
const struct attrmap *map;
size_t nmap;
const u_char *ep2;
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_T)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_T));
p = (const struct ikev1_pl_t *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&t, ext, sizeof(t));
+ ND_TCHECK_SIZE(p);
switch (proto) {
case 1:
- idstr = STR_OR_ID(t.t_id, ikev1_p_map);
+ idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ikev1_p_map);
map = oakley_t_map;
nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
break;
case 2:
- idstr = STR_OR_ID(t.t_id, ah_p_map);
+ idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ah_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
case 3:
- idstr = STR_OR_ID(t.t_id, esp_p_map);
+ idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), esp_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
case 4:
- idstr = STR_OR_ID(t.t_id, ipcomp_p_map);
+ idstr = STR_OR_ID(EXTRACT_U_1(p->t_id), ipcomp_p_map);
map = ipsec_t_map;
nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]);
break;
}
if (idstr)
- ND_PRINT((ndo," #%d id=%s ", t.t_no, idstr));
+ ND_PRINT(" #%u id=%s ", EXTRACT_U_1(p->t_no), idstr);
else
- ND_PRINT((ndo," #%d id=%d ", t.t_no, t.t_id));
+ ND_PRINT(" #%u id=%u ", EXTRACT_U_1(p->t_no), EXTRACT_U_1(p->t_id));
cp = (const u_char *)(p + 1);
ep2 = (const u_char *)p + item_len;
while (cp < ep && cp < ep2) {
- if (map && nmap) {
- cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,
- map, nmap);
- } else
- cp = ikev1_attr_print(ndo, cp, (ep < ep2) ? ep : ep2);
+ 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;
}
if (ep < ep2)
- ND_PRINT((ndo,"..."));
+ ND_PRINT("...");
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_T)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_T));
return NULL;
}
static const u_char *
ikev1_ke_print(netdissect_options *ndo, u_char tpay _U_,
- const struct isakmp_gen *ext, u_int item_len _U_,
+ const struct isakmp_gen *ext, u_int item_len,
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_KE));
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_KE)));
-
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ND_PRINT((ndo," key len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ ND_TCHECK_SIZE(ext);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" key len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && item_len > 4) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_KE)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_KE));
return NULL;
}
{
#define USE_IPSECDOI_IN_PHASE1 1
const struct ikev1_pl_id *p;
- struct ikev1_pl_id id;
static const char *idtypestr[] = {
"IPv4", "IPv4net", "IPv6", "IPv6net",
};
"IPv6net", "IPv4range", "IPv6range", "ASN1 DN", "ASN1 GN",
"keyid",
};
- int len;
+ u_int len;
const u_char *data;
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_ID)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_ID));
p = (const struct ikev1_pl_id *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&id, ext, sizeof(id));
+ ND_TCHECK_SIZE(p);
if (sizeof(*p) < item_len) {
data = (const u_char *)(p + 1);
len = item_len - sizeof(*p);
}
#if 0 /*debug*/
- ND_PRINT((ndo," [phase=%d doi=%d proto=%d]", phase, doi, proto));
+ ND_PRINT(" [phase=%u doi=%u proto=%u]", phase, doi, proto);
#endif
switch (phase) {
#ifndef USE_IPSECDOI_IN_PHASE1
case 1:
#endif
default:
- ND_PRINT((ndo," idtype=%s", STR_OR_ID(id.d.id_type, idtypestr)));
- ND_PRINT((ndo," doi_data=%u",
- (uint32_t)(ntohl(id.d.doi_data) & 0xffffff)));
+ ND_PRINT(" idtype=%s", STR_OR_ID(EXTRACT_U_1(p->d.id_type), idtypestr));
+ ND_PRINT(" doi_data=%u",
+ EXTRACT_BE_U_4(p->d.doi_data) & 0xffffff);
break;
#ifdef USE_IPSECDOI_IN_PHASE1
case 2:
{
const struct ipsecdoi_id *doi_p;
- struct ipsecdoi_id doi_id;
- struct protoent *pe;
+ const char *p_name;
+ uint8_t type, proto_id;
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)));
+ ND_TCHECK_SIZE(doi_p);
+ type = EXTRACT_U_1(doi_p->type);
+ ND_PRINT(" idtype=%s", STR_OR_ID(type, ipsecidtypestr));
/* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */
- pe = doi_id.proto_id ? getprotobynumber(doi_id.proto_id) : NULL;
- if (pe)
- ND_PRINT((ndo," protoid=%s", pe->p_name));
+ proto_id = EXTRACT_U_1(doi_p->proto_id);
+ if (!ndo->ndo_nflag && proto_id && (p_name = netdb_protoname(proto_id)) != NULL)
+ ND_PRINT(" protoid=%s", p_name);
else
- ND_PRINT((ndo," protoid=%u", doi_id.proto_id));
- ND_PRINT((ndo," port=%d", ntohs(doi_id.port)));
+ ND_PRINT(" protoid=%u", proto_id);
+ ND_PRINT(" port=%u", EXTRACT_BE_U_2(doi_p->port));
if (!len)
break;
if (data == NULL)
goto trunc;
- ND_TCHECK2(*data, len);
- switch (doi_id.type) {
+ ND_TCHECK_LEN(data, len);
+ switch (type) {
case IPSECDOI_ID_IPV4_ADDR:
if (len < 4)
- ND_PRINT((ndo," len=%d [bad: < 4]", len));
+ ND_PRINT(" len=%u [bad: < 4]", len);
else
- ND_PRINT((ndo," len=%d %s", len, ipaddr_string(ndo, data)));
+ ND_PRINT(" len=%u %s", len, ipaddr_string(ndo, data));
len = 0;
break;
case IPSECDOI_ID_FQDN:
case IPSECDOI_ID_USER_FQDN:
{
- int i;
- ND_PRINT((ndo," len=%d ", len));
+ u_int i;
+ ND_PRINT(" len=%u ", len);
for (i = 0; i < len; i++)
- safeputchar(ndo, data[i]);
+ fn_print_char(ndo, EXTRACT_U_1(data + i));
len = 0;
break;
}
{
const u_char *mask;
if (len < 8)
- ND_PRINT((ndo," len=%d [bad: < 8]", len));
+ ND_PRINT(" len=%u [bad: < 8]", len);
else {
- mask = data + sizeof(struct in_addr);
- ND_PRINT((ndo," len=%d %s/%u.%u.%u.%u", len,
+ mask = data + sizeof(nd_ipv4);
+ ND_PRINT(" len=%u %s/%u.%u.%u.%u", len,
ipaddr_string(ndo, data),
- mask[0], mask[1], mask[2], mask[3]));
+ EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1),
+ EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3));
}
len = 0;
break;
}
case IPSECDOI_ID_IPV6_ADDR:
if (len < 16)
- ND_PRINT((ndo," len=%d [bad: < 16]", len));
+ ND_PRINT(" len=%u [bad: < 16]", len);
else
- ND_PRINT((ndo," len=%d %s", len, ip6addr_string(ndo, data)));
+ ND_PRINT(" len=%u %s", len, ip6addr_string(ndo, data));
len = 0;
break;
case IPSECDOI_ID_IPV6_ADDR_SUBNET:
{
const u_char *mask;
- if (len < 20)
- ND_PRINT((ndo," len=%d [bad: < 20]", len));
+ if (len < 32)
+ ND_PRINT(" len=%u [bad: < 32]", len);
else {
- mask = (const u_char *)(data + sizeof(struct in6_addr));
+ mask = (const u_char *)(data + sizeof(nd_ipv6));
/*XXX*/
- ND_PRINT((ndo," len=%d %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,
+ ND_PRINT(" len=%u %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len,
ip6addr_string(ndo, data),
- mask[0], mask[1], mask[2], mask[3],
- mask[4], mask[5], mask[6], mask[7],
- mask[8], mask[9], mask[10], mask[11],
- mask[12], mask[13], mask[14], mask[15]));
+ 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));
}
len = 0;
break;
}
case IPSECDOI_ID_IPV4_ADDR_RANGE:
if (len < 8)
- ND_PRINT((ndo," len=%d [bad: < 8]", len));
+ ND_PRINT(" len=%u [bad: < 8]", len);
else {
- ND_PRINT((ndo," len=%d %s-%s", len,
+ ND_PRINT(" len=%u %s-%s", len,
ipaddr_string(ndo, data),
- ipaddr_string(ndo, data + sizeof(struct in_addr))));
+ ipaddr_string(ndo, data + sizeof(nd_ipv4)));
}
len = 0;
break;
case IPSECDOI_ID_IPV6_ADDR_RANGE:
if (len < 32)
- ND_PRINT((ndo," len=%d [bad: < 32]", len));
+ ND_PRINT(" len=%u [bad: < 32]", len);
else {
- ND_PRINT((ndo," len=%d %s-%s", len,
+ ND_PRINT(" len=%u %s-%s", len,
ip6addr_string(ndo, data),
- ip6addr_string(ndo, data + sizeof(struct in6_addr))));
+ ip6addr_string(ndo, data + sizeof(nd_ipv6)));
}
len = 0;
break;
}
}
if (data && len) {
- ND_PRINT((ndo," len=%d", len));
+ ND_PRINT(" len=%u", len);
if (2 < ndo->ndo_vflag) {
- ND_PRINT((ndo," "));
+ ND_PRINT(" ");
if (!rawprint(ndo, (const uint8_t *)data, len))
goto trunc;
}
}
return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_ID)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_ID));
return NULL;
}
uint32_t proto0 _U_, int depth _U_)
{
const struct ikev1_pl_cert *p;
- struct ikev1_pl_cert cert;
static const char *certstr[] = {
"none", "pkcs7", "pgp", "dns",
"x509sign", "x509ke", "kerberos", "crl",
"arl", "spki", "x509attr",
};
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CERT)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_CERT));
p = (const struct ikev1_pl_cert *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));
- ND_PRINT((ndo," len=%d", item_len - 4));
- ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));
+ ND_TCHECK_SIZE(p);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ ND_PRINT(" type=%s", STR_OR_ID(EXTRACT_U_1(p->encode), certstr));
if (2 < ndo->ndo_vflag && 4 < item_len) {
- ND_PRINT((ndo," "));
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CERT)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_CERT));
return NULL;
}
uint32_t proto0 _U_, int depth _U_)
{
const struct ikev1_pl_cert *p;
- struct ikev1_pl_cert cert;
static const char *certstr[] = {
"none", "pkcs7", "pgp", "dns",
"x509sign", "x509ke", "kerberos", "crl",
"arl", "spki", "x509attr",
};
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_CR)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_CR));
p = (const struct ikev1_pl_cert *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&cert, ext, sizeof(cert));
- ND_PRINT((ndo," len=%d", item_len - 4));
- ND_PRINT((ndo," type=%s", STR_OR_ID((cert.encode), certstr)));
+ ND_TCHECK_SIZE(p);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ ND_PRINT(" type=%s", STR_OR_ID(EXTRACT_U_1(p->encode), certstr));
if (2 < ndo->ndo_vflag && 4 < item_len) {
- ND_PRINT((ndo," "));
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_CR)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_CR));
return NULL;
}
static const u_char *
ikev1_hash_print(netdissect_options *ndo, u_char tpay _U_,
- const struct isakmp_gen *ext, u_int item_len _U_,
+ const struct isakmp_gen *ext, u_int item_len,
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_HASH));
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_HASH)));
-
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ ND_TCHECK_SIZE(ext);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && 4 < item_len) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_HASH)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_HASH));
return NULL;
}
static const u_char *
ikev1_sig_print(netdissect_options *ndo, u_char tpay _U_,
- const struct isakmp_gen *ext, u_int item_len _U_,
+ const struct isakmp_gen *ext, u_int item_len,
const u_char *ep _U_, uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
-
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_SIG)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_SIG));
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ ND_TCHECK_SIZE(ext);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && 4 < item_len) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_SIG)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_SIG));
return NULL;
}
static const u_char *
ikev1_nonce_print(netdissect_options *ndo, u_char tpay _U_,
const struct isakmp_gen *ext,
- u_int item_len _U_,
+ u_int item_len,
const u_char *ep,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
-
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_NONCE)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_NONCE));
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ND_PRINT((ndo," n len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
- goto trunc;
- } else if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!ike_show_somedata(ndo, (const u_char *)(const uint8_t *)(ext + 1), ep))
- goto trunc;
+ ND_TCHECK_SIZE(ext);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" n len=%u", item_len - 4);
+ if (item_len > 4) {
+ if (ndo->ndo_vflag > 2) {
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
+ goto trunc;
+ } else if (ndo->ndo_vflag > 1) {
+ ND_PRINT(" ");
+ if (!ike_show_somedata(ndo, (const u_char *)(ext + 1), ep))
+ goto trunc;
+ }
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE));
return NULL;
}
static const u_char *
ikev1_n_print(netdissect_options *ndo, u_char tpay _U_,
const struct isakmp_gen *ext, u_int item_len,
- const u_char *ep, uint32_t phase, uint32_t doi0 _U_,
- uint32_t proto0 _U_, int depth)
+ const u_char *ep, uint32_t phase _U_, uint32_t doi0 _U_,
+ uint32_t proto0 _U_, int depth _U_)
{
const struct ikev1_pl_n *p;
- struct ikev1_pl_n n;
const u_char *cp;
const u_char *ep2;
uint32_t doi;
uint32_t proto;
+ uint16_t type;
+ uint8_t spi_size;
static const char *notify_error_str[] = {
NULL, "INVALID-PAYLOAD-TYPE",
"DOI-NOT-SUPPORTED", "SITUATION-NOT-SUPPORTED",
#define IPSEC_NOTIFY_STATUS_STR(x) \
STR_OR_ID((u_int)((x) - 24576), ipsec_notify_status_str)
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_N)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_N));
p = (const struct ikev1_pl_n *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&n, ext, sizeof(n));
- doi = ntohl(n.doi);
- proto = n.prot_id;
+ ND_TCHECK_SIZE(p);
+ doi = EXTRACT_BE_U_4(p->doi);
+ proto = EXTRACT_U_1(p->prot_id);
if (doi != 1) {
- ND_PRINT((ndo," doi=%d", doi));
- ND_PRINT((ndo," proto=%d", proto));
- if (ntohs(n.type) < 8192)
- ND_PRINT((ndo," type=%s", NOTIFY_ERROR_STR(ntohs(n.type))));
- else if (ntohs(n.type) < 16384)
- ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
- else if (ntohs(n.type) < 24576)
- ND_PRINT((ndo," type=%s", NOTIFY_STATUS_STR(ntohs(n.type))));
+ ND_PRINT(" doi=%u", doi);
+ ND_PRINT(" proto=%u", proto);
+ type = EXTRACT_BE_U_2(p->type);
+ if (type < 8192)
+ ND_PRINT(" type=%s", NOTIFY_ERROR_STR(type));
+ else if (type < 16384)
+ ND_PRINT(" type=%s", numstr(type));
+ else if (type < 24576)
+ ND_PRINT(" type=%s", NOTIFY_STATUS_STR(type));
else
- ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
- if (n.spi_size) {
- ND_PRINT((ndo," spi="));
- if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
+ ND_PRINT(" type=%s", numstr(type));
+ spi_size = EXTRACT_U_1(p->spi_size);
+ if (spi_size) {
+ ND_PRINT(" spi=");
+ if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
goto trunc;
}
- return (const u_char *)(p + 1) + n.spi_size;
- }
-
- ND_PRINT((ndo," doi=ipsec"));
- ND_PRINT((ndo," proto=%s", PROTOIDSTR(proto)));
- if (ntohs(n.type) < 8192)
- ND_PRINT((ndo," type=%s", NOTIFY_ERROR_STR(ntohs(n.type))));
- else if (ntohs(n.type) < 16384)
- ND_PRINT((ndo," type=%s", IPSEC_NOTIFY_ERROR_STR(ntohs(n.type))));
- else if (ntohs(n.type) < 24576)
- ND_PRINT((ndo," type=%s", NOTIFY_STATUS_STR(ntohs(n.type))));
- else if (ntohs(n.type) < 32768)
- ND_PRINT((ndo," type=%s", IPSEC_NOTIFY_STATUS_STR(ntohs(n.type))));
+ return (const u_char *)(p + 1) + spi_size;
+ }
+
+ ND_PRINT(" doi=ipsec");
+ ND_PRINT(" proto=%s", PROTOIDSTR(proto));
+ type = EXTRACT_BE_U_2(p->type);
+ if (type < 8192)
+ ND_PRINT(" type=%s", NOTIFY_ERROR_STR(type));
+ else if (type < 16384)
+ ND_PRINT(" type=%s", IPSEC_NOTIFY_ERROR_STR(type));
+ else if (type < 24576)
+ ND_PRINT(" type=%s", NOTIFY_STATUS_STR(type));
+ else if (type < 32768)
+ ND_PRINT(" type=%s", IPSEC_NOTIFY_STATUS_STR(type));
else
- ND_PRINT((ndo," type=%s", numstr(ntohs(n.type))));
- if (n.spi_size) {
- ND_PRINT((ndo," spi="));
- if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
+ ND_PRINT(" type=%s", numstr(type));
+ spi_size = EXTRACT_U_1(p->spi_size);
+ if (spi_size) {
+ ND_PRINT(" spi=");
+ if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
goto trunc;
}
- cp = (const u_char *)(p + 1) + n.spi_size;
+ cp = (const u_char *)(p + 1) + spi_size;
ep2 = (const u_char *)p + item_len;
if (cp < ep) {
- ND_PRINT((ndo," orig=("));
- switch (ntohs(n.type)) {
+ switch (type) {
case IPSECDOI_NTYPE_RESPONDER_LIFETIME:
{
const struct attrmap *map = oakley_t_map;
size_t nmap = sizeof(oakley_t_map)/sizeof(oakley_t_map[0]);
+ ND_PRINT(" attrs=(");
while (cp < ep && cp < ep2) {
- cp = ikev1_attrmap_print(ndo, cp,
- (ep < ep2) ? ep : ep2, map, nmap);
+ cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap);
+ if (cp == NULL) {
+ ND_PRINT(")");
+ goto trunc;
+ }
}
+ ND_PRINT(")");
break;
}
case IPSECDOI_NTYPE_REPLAY_STATUS:
- ND_PRINT((ndo,"replay detection %sabled",
- EXTRACT_32BITS(cp) ? "en" : "dis"));
- break;
- case ISAKMP_NTYPE_NO_PROPOSAL_CHOSEN:
- if (ikev1_sub_print(ndo, ISAKMP_NPTYPE_SA,
- (const struct isakmp_gen *)cp, ep, phase, doi, proto,
- depth) == NULL)
- return NULL;
+ ND_PRINT(" status=(");
+ ND_PRINT("replay detection %sabled",
+ EXTRACT_BE_U_4(cp) ? "en" : "dis");
+ ND_PRINT(")");
break;
default:
- /* NULL is dummy */
- isakmp_print(ndo, cp,
- item_len - sizeof(*p) - n.spi_size,
- NULL);
+ /*
+ * XXX - fill in more types here; see, for example,
+ * draft-ietf-ipsec-notifymsg-04.
+ */
+ if (ndo->ndo_vflag > 3) {
+ ND_PRINT(" data=(");
+ if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))
+ goto trunc;
+ ND_PRINT(")");
+ } else {
+ if (!ike_show_somedata(ndo, cp, ep))
+ goto trunc;
+ }
+ break;
}
- ND_PRINT((ndo,")"));
}
return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_N));
return NULL;
}
uint32_t proto0 _U_, int depth _U_)
{
const struct ikev1_pl_d *p;
- struct ikev1_pl_d d;
const uint8_t *q;
uint32_t doi;
uint32_t proto;
- int i;
+ uint8_t spi_size;
+ uint16_t num_spi;
+ u_int i;
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_D)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_D));
p = (const struct ikev1_pl_d *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&d, ext, sizeof(d));
- doi = ntohl(d.doi);
- proto = d.prot_id;
+ ND_TCHECK_SIZE(p);
+ doi = EXTRACT_BE_U_4(p->doi);
+ proto = EXTRACT_U_1(p->prot_id);
if (doi != 1) {
- ND_PRINT((ndo," doi=%u", doi));
- ND_PRINT((ndo," proto=%u", proto));
+ ND_PRINT(" doi=%u", doi);
+ ND_PRINT(" proto=%u", proto);
} else {
- ND_PRINT((ndo," doi=ipsec"));
- ND_PRINT((ndo," proto=%s", PROTOIDSTR(proto)));
- }
- ND_PRINT((ndo," spilen=%u", d.spi_size));
- ND_PRINT((ndo," nspi=%u", ntohs(d.num_spi)));
- ND_PRINT((ndo," spi="));
+ ND_PRINT(" doi=ipsec");
+ ND_PRINT(" proto=%s", PROTOIDSTR(proto));
+ }
+ spi_size = EXTRACT_U_1(p->spi_size);
+ ND_PRINT(" spilen=%u", spi_size);
+ num_spi = EXTRACT_BE_U_2(p->num_spi);
+ ND_PRINT(" nspi=%u", num_spi);
+ ND_PRINT(" spi=");
q = (const uint8_t *)(p + 1);
- for (i = 0; i < ntohs(d.num_spi); i++) {
+ for (i = 0; i < num_spi; i++) {
if (i != 0)
- ND_PRINT((ndo,","));
- if (!rawprint(ndo, (const uint8_t *)q, d.spi_size))
+ ND_PRINT(",");
+ if (!rawprint(ndo, (const uint8_t *)q, spi_size))
goto trunc;
- q += d.spi_size;
+ q += spi_size;
}
return q;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_D)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_D));
return NULL;
}
static const u_char *
ikev1_vid_print(netdissect_options *ndo, u_char tpay _U_,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
-
- ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_VID)));
+ ND_PRINT("%s:", NPSTR(ISAKMP_NPTYPE_VID));
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ ND_TCHECK_SIZE(ext);
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && 4 < item_len) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_VID)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_VID));
return NULL;
}
/************************************************************/
static void
-ikev2_pay_print(netdissect_options *ndo, const char *payname, int critical)
+ikev2_pay_print(netdissect_options *ndo, const char *payname, uint8_t critical)
{
- ND_PRINT((ndo,"%s%s:", payname, critical&0x80 ? "[C]" : ""));
+ ND_PRINT("%s%s:", payname, critical&0x80 ? "[C]" : "");
}
static const u_char *
ikev2_gen_print(netdissect_options *ndo, u_char tpay,
- const struct isakmp_gen *ext)
+ const struct isakmp_gen *ext, u_int item_len)
{
- struct isakmp_gen e;
+ const struct isakmp_gen *p = (const struct isakmp_gen *)ext;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
+ ND_TCHECK_SIZE(ext);
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(p->critical));
- ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
- if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && 4 < item_len) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
-ikev2_t_print(netdissect_options *ndo, u_char tpay _U_, int pcount,
+ikev2_t_print(netdissect_options *ndo, int tcount,
const struct isakmp_gen *ext, u_int item_len,
- const u_char *ep, uint32_t phase _U_, uint32_t doi _U_,
- uint32_t proto _U_, int depth _U_)
+ const u_char *ep)
{
const struct ikev2_t *p;
- struct ikev2_t t;
uint16_t t_id;
+ uint8_t t_type;
const u_char *cp;
const char *idstr;
const struct attrmap *map;
const u_char *ep2;
p = (const struct ikev2_t *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&t, ext, sizeof(t));
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), t.h.critical);
+ ND_TCHECK_SIZE(p);
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_T), EXTRACT_U_1(p->h.critical));
- t_id = ntohs(t.t_id);
+ t_id = EXTRACT_BE_U_2(p->t_id);
map = NULL;
nmap = 0;
- switch (t.t_type) {
+ t_type = EXTRACT_U_1(p->t_type);
+ switch (t_type) {
case IV2_T_ENCR:
idstr = STR_OR_ID(t_id, esp_p_map);
map = encr_t_map;
}
if (idstr)
- ND_PRINT((ndo," #%u type=%s id=%s ", pcount,
- STR_OR_ID(t.t_type, ikev2_t_type_map),
- idstr));
+ ND_PRINT(" #%u type=%s id=%s ", tcount,
+ STR_OR_ID(t_type, ikev2_t_type_map),
+ idstr);
else
- ND_PRINT((ndo," #%u type=%s id=%u ", pcount,
- STR_OR_ID(t.t_type, ikev2_t_type_map),
- t.t_id));
+ ND_PRINT(" #%u type=%s id=%u ", tcount,
+ STR_OR_ID(t_type, ikev2_t_type_map),
+ t_id);
cp = (const u_char *)(p + 1);
ep2 = (const u_char *)p + item_len;
while (cp < ep && cp < ep2) {
if (map && nmap) {
- cp = ikev1_attrmap_print(ndo, cp, (ep < ep2) ? ep : ep2,
- map, nmap);
+ cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap);
} else
- cp = ikev1_attr_print(ndo, cp, (ep < ep2) ? ep : ep2);
+ cp = ikev1_attr_print(ndo, cp, ep2);
+ if (cp == NULL)
+ goto trunc;
}
if (ep < ep2)
- ND_PRINT((ndo,"..."));
+ ND_PRINT("...");
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_T)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_T));
return NULL;
}
static const u_char *
ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_,
- const struct isakmp_gen *ext, u_int item_len _U_,
- const u_char *ep, uint32_t phase, uint32_t doi0,
- uint32_t proto0 _U_, int depth)
+ const struct isakmp_gen *ext, u_int oprop_length,
+ const u_char *ep, int depth)
{
const struct ikev2_p *p;
- struct ikev2_p prop;
+ u_int prop_length;
+ uint8_t spi_size;
const u_char *cp;
+ int i;
+ int tcount;
+ u_char np;
+ u_int item_len;
p = (const struct ikev2_p *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&prop, ext, sizeof(prop));
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical);
-
- ND_PRINT((ndo," #%u protoid=%s transform=%d len=%u",
- prop.p_no, PROTOIDSTR(prop.prot_id),
- prop.num_t, ntohs(prop.h.len)));
- if (prop.spi_size) {
- ND_PRINT((ndo," spi="));
- if (!rawprint(ndo, (const uint8_t *)(p + 1), prop.spi_size))
+ ND_TCHECK_SIZE(p);
+
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), EXTRACT_U_1(p->h.critical));
+
+ /*
+ * ikev2_sa_print() guarantees that this is >= 4.
+ */
+ prop_length = oprop_length - 4;
+ ND_PRINT(" #%u protoid=%s transform=%u len=%u",
+ EXTRACT_U_1(p->p_no), PROTOIDSTR(EXTRACT_U_1(p->prot_id)),
+ EXTRACT_U_1(p->num_t), oprop_length);
+ cp = (const u_char *)(p + 1);
+
+ spi_size = EXTRACT_U_1(p->spi_size);
+ if (spi_size) {
+ if (prop_length < spi_size)
+ goto toolong;
+ ND_PRINT(" spi=");
+ if (!rawprint(ndo, (const uint8_t *)cp, spi_size))
goto trunc;
+ cp += spi_size;
+ prop_length -= spi_size;
}
- ext = (const struct isakmp_gen *)((const u_char *)(p + 1) + prop.spi_size);
- ND_TCHECK(*ext);
+ /*
+ * Print the transforms.
+ */
+ tcount = 0;
+ for (np = ISAKMP_NPTYPE_T; np != 0; np = EXTRACT_U_1(ext->np)) {
+ tcount++;
+ ext = (const struct isakmp_gen *)cp;
+ if (prop_length < sizeof(*ext))
+ goto toolong;
+ ND_TCHECK_SIZE(ext);
- cp = ikev2_sub_print(ndo, NULL, ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
- prop.prot_id, depth);
+ /*
+ * 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 = EXTRACT_BE_U_2(ext->len);
+ if (item_len <= 4)
+ goto trunc;
+
+ if (prop_length < item_len)
+ goto toolong;
+ ND_TCHECK_LEN(cp, item_len);
+ depth++;
+ ND_PRINT("\n");
+ for (i = 0; i < depth; i++)
+ ND_PRINT(" ");
+ ND_PRINT("(");
+ 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("%s", NPSTR(np));
+ cp += item_len;
+ }
+ ND_PRINT(")");
+ depth--;
+ prop_length -= item_len;
+ }
+ return cp;
+toolong:
+ /*
+ * Skip the rest of the proposal.
+ */
+ cp += prop_length;
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_P));
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_P));
return NULL;
}
static const u_char *
ikev2_sa_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext1,
- u_int item_len _U_, const u_char *ep,
+ u_int osa_length, const u_char *ep,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth)
{
- struct isakmp_gen e;
- int osa_length, sa_length;
+ const struct isakmp_gen *ext;
+ u_int sa_length;
+ const u_char *cp;
+ int i;
+ int pcount;
+ u_char np;
+ u_int item_len;
- ND_TCHECK(*ext1);
- UNALIGNED_MEMCPY(&e, ext1, sizeof(e));
- ikev2_pay_print(ndo, "sa", e.critical);
+ ND_TCHECK_SIZE(ext1);
+ ikev2_pay_print(ndo, "sa", EXTRACT_U_1(ext1->critical));
- osa_length= ntohs(e.len);
+ /*
+ * ikev2_sub0_print() guarantees that this is >= 4.
+ */
+ osa_length= EXTRACT_BE_U_2(ext1->len);
sa_length = osa_length - 4;
- ND_PRINT((ndo," len=%d", sa_length));
+ ND_PRINT(" len=%u", sa_length);
- ikev2_sub_print(ndo, NULL, ISAKMP_NPTYPE_P,
- ext1+1, ep,
- 0, 0, 0, depth);
+ /*
+ * Print the payloads.
+ */
+ cp = (const u_char *)(ext1 + 1);
+ pcount = 0;
+ for (np = ISAKMP_NPTYPE_P; np != 0; np = EXTRACT_U_1(ext->np)) {
+ pcount++;
+ ext = (const struct isakmp_gen *)cp;
+ if (sa_length < sizeof(*ext))
+ goto toolong;
+ ND_TCHECK_SIZE(ext);
- return (const u_char *)ext1 + osa_length;
+ /*
+ * 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 = EXTRACT_BE_U_2(ext->len);
+ if (item_len <= 4)
+ goto trunc;
+
+ if (sa_length < item_len)
+ goto toolong;
+ ND_TCHECK_LEN(cp, item_len);
+
+ depth++;
+ ND_PRINT("\n");
+ for (i = 0; i < depth; i++)
+ ND_PRINT(" ");
+ ND_PRINT("(");
+ 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("%s", NPSTR(np));
+ cp += item_len;
+ }
+ ND_PRINT(")");
+ depth--;
+ sa_length -= item_len;
+ }
+ return cp;
+toolong:
+ /*
+ * Skip the rest of the SA.
+ */
+ cp += sa_length;
+ ND_PRINT(" [|%s]", NPSTR(tpay));
+ return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_ke_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct ikev2_ke ke;
const struct ikev2_ke *k;
k = (const struct ikev2_ke *)ext;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&ke, ext, sizeof(ke));
- ikev2_pay_print(ndo, NPSTR(tpay), ke.h.critical);
+ ND_TCHECK_SIZE(k);
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(k->h.critical));
- ND_PRINT((ndo," len=%u group=%s", ntohs(ke.h.len) - 8,
- STR_OR_ID(ntohs(ke.ke_group), dh_p_map)));
+ if (item_len < 8) {
+ ND_PRINT(" len=%u < 8", item_len);
+ return (const u_char *)ext + item_len;
+ }
+ ND_PRINT(" len=%u group=%s", item_len - 8,
+ STR_OR_ID(EXTRACT_BE_U_2(k->ke_group), dh_p_map));
- if (2 < ndo->ndo_vflag && 8 < ntohs(ke.h.len)) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(k + 1), ntohs(ke.h.len) - 8))
+ if (2 < ndo->ndo_vflag && 8 < item_len) {
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(k + 1), item_len - 8))
goto trunc;
}
- return (const u_char *)ext + ntohs(ke.h.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_ID_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct ikev2_id id;
- int id_len, idtype_len, i;
+ const struct ikev2_id *idp;
+ u_int idtype_len, i;
unsigned int dumpascii, dumphex;
const unsigned char *typedata;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&id, ext, sizeof(id));
- ikev2_pay_print(ndo, NPSTR(tpay), id.h.critical);
-
- id_len = ntohs(id.h.len);
+ idp = (const struct ikev2_id *)ext;
+ ND_TCHECK_SIZE(idp);
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(idp->h.critical));
- ND_PRINT((ndo," len=%d", id_len - 4));
- if (2 < ndo->ndo_vflag && 4 < id_len) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), id_len - 4))
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (2 < ndo->ndo_vflag && 4 < item_len) {
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- idtype_len =id_len - sizeof(struct ikev2_id);
+ idtype_len =item_len - sizeof(struct ikev2_id);
dumpascii = 0;
dumphex = 0;
typedata = (const unsigned char *)(ext)+sizeof(struct ikev2_id);
- switch(id.type) {
+ switch(EXTRACT_U_1(idp->type)) {
case ID_IPV4_ADDR:
- ND_PRINT((ndo, " ipv4:"));
+ ND_PRINT(" ipv4:");
dumphex=1;
break;
case ID_FQDN:
- ND_PRINT((ndo, " fqdn:"));
+ ND_PRINT(" fqdn:");
dumpascii=1;
break;
case ID_RFC822_ADDR:
- ND_PRINT((ndo, " rfc822:"));
+ ND_PRINT(" rfc822:");
dumpascii=1;
break;
case ID_IPV6_ADDR:
- ND_PRINT((ndo, " ipv6:"));
+ ND_PRINT(" ipv6:");
dumphex=1;
break;
case ID_DER_ASN1_DN:
- ND_PRINT((ndo, " dn:"));
+ ND_PRINT(" dn:");
dumphex=1;
break;
case ID_DER_ASN1_GN:
- ND_PRINT((ndo, " gn:"));
+ ND_PRINT(" gn:");
dumphex=1;
break;
case ID_KEY_ID:
- ND_PRINT((ndo, " keyid:"));
+ ND_PRINT(" keyid:");
dumphex=1;
break;
}
if(dumpascii) {
- ND_TCHECK2(*typedata, idtype_len);
+ ND_TCHECK_LEN(typedata, idtype_len);
for(i=0; i<idtype_len; i++) {
- if(ND_ISPRINT(typedata[i])) {
- ND_PRINT((ndo, "%c", typedata[i]));
+ if(ND_ISPRINT(EXTRACT_U_1(typedata + i))) {
+ ND_PRINT("%c", EXTRACT_U_1(typedata + i));
} else {
- ND_PRINT((ndo, "."));
+ ND_PRINT(".");
}
}
}
goto trunc;
}
- return (const u_char *)ext + id_len;
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_cert_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
ikev2_cr_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
ikev2_auth_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep,
+ u_int item_len, const u_char *ep,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct ikev2_auth a;
+ const struct ikev2_auth *p;
const char *v2_auth[]={ "invalid", "rsasig",
"shared-secret", "dsssig" };
- const u_char *authdata = (const u_char*)ext + sizeof(a);
- unsigned int len;
+ const u_char *authdata = (const u_char*)ext + sizeof(struct ikev2_auth);
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&a, ext, sizeof(a));
- ikev2_pay_print(ndo, NPSTR(tpay), a.h.critical);
- len = ntohs(a.h.len);
+ ND_TCHECK_LEN(ext, sizeof(struct ikev2_auth));
+ p = (const struct ikev2_auth *)ext;
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(p->h.critical));
- ND_PRINT((ndo," len=%d method=%s", len-4,
- STR_OR_ID(a.auth_method, v2_auth)));
-
- if (1 < ndo->ndo_vflag && 4 < len) {
- ND_PRINT((ndo," authdata=("));
- if (!rawprint(ndo, (const uint8_t *)authdata, len - sizeof(a)))
- goto trunc;
- ND_PRINT((ndo,") "));
- } else if(ndo->ndo_vflag && 4 < len) {
- if(!ike_show_somedata(ndo, authdata, ep)) goto trunc;
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u method=%s", item_len-4,
+ STR_OR_ID(EXTRACT_U_1(p->auth_method), v2_auth));
+ if (item_len > 4) {
+ if (ndo->ndo_vflag > 1) {
+ ND_PRINT(" authdata=(");
+ if (!rawprint(ndo, (const uint8_t *)authdata, item_len - sizeof(struct ikev2_auth)))
+ goto trunc;
+ ND_PRINT(") ");
+ } else if (ndo->ndo_vflag) {
+ if (!ike_show_somedata(ndo, authdata, ep))
+ goto trunc;
+ }
}
- return (const u_char *)ext + len;
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_nonce_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep,
+ u_int item_len, const u_char *ep,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
-
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ikev2_pay_print(ndo, "nonce", e.critical);
+ ND_TCHECK_SIZE(ext);
+ ikev2_pay_print(ndo, "nonce", EXTRACT_U_1(ext->critical));
- ND_PRINT((ndo," len=%d", ntohs(e.len) - 4));
- if (1 < ndo->ndo_vflag && 4 < ntohs(e.len)) {
- ND_PRINT((ndo," nonce=("));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u", item_len - 4);
+ if (1 < ndo->ndo_vflag && 4 < item_len) {
+ ND_PRINT(" nonce=(");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
- ND_PRINT((ndo,") "));
- } else if(ndo->ndo_vflag && 4 < ntohs(e.len)) {
+ ND_PRINT(") ");
+ } else if(ndo->ndo_vflag && 4 < item_len) {
if(!ike_show_somedata(ndo, (const u_char *)(ext+1), ep)) goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
uint32_t proto _U_, int depth _U_)
{
const struct ikev2_n *p;
- struct ikev2_n n;
+ uint16_t type;
+ uint8_t spi_size;
const u_char *cp;
- u_char showspi, showdata, showsomedata;
+ u_char showspi, showsomedata;
const char *notify_name;
- uint32_t type;
p = (const struct ikev2_n *)ext;
- ND_TCHECK(*p);
- UNALIGNED_MEMCPY(&n, ext, sizeof(n));
- ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), n.h.critical);
+ ND_TCHECK_SIZE(p);
+ ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_N), EXTRACT_U_1(p->h.critical));
showspi = 1;
- showdata = 0;
showsomedata=0;
notify_name=NULL;
- ND_PRINT((ndo," prot_id=%s", PROTOIDSTR(n.prot_id)));
+ ND_PRINT(" prot_id=%s", PROTOIDSTR(EXTRACT_U_1(p->prot_id)));
- type = ntohs(n.type);
+ type = EXTRACT_BE_U_2(p->type);
/* notify space is annoying sparse */
switch(type) {
notify_name = "cookie";
showspi = 1;
showsomedata= 1;
- showdata= 0;
break;
case IV2_NOTIFY_USE_TRANSPORT_MODE:
}
if(notify_name) {
- ND_PRINT((ndo," type=%u(%s)", type, notify_name));
+ ND_PRINT(" type=%u(%s)", type, notify_name);
}
- if (showspi && n.spi_size) {
- ND_PRINT((ndo," spi="));
- if (!rawprint(ndo, (const uint8_t *)(p + 1), n.spi_size))
+ spi_size = EXTRACT_U_1(p->spi_size);
+ if (showspi && spi_size) {
+ ND_PRINT(" spi=");
+ if (!rawprint(ndo, (const uint8_t *)(p + 1), spi_size))
goto trunc;
}
- cp = (const u_char *)(p + 1) + n.spi_size;
-
- if(3 < ndo->ndo_vflag) {
- showdata = 1;
- }
+ cp = (const u_char *)(p + 1) + spi_size;
- if ((showdata || (showsomedata && ep-cp < 30)) && cp < ep) {
- ND_PRINT((ndo," data=("));
- if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))
- goto trunc;
-
- ND_PRINT((ndo,")"));
+ if (cp < ep) {
+ if (ndo->ndo_vflag > 3 || (showsomedata && ep-cp < 30)) {
+ ND_PRINT(" data=(");
+ if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp))
+ goto trunc;
- } else if(showsomedata && cp < ep) {
- if(!ike_show_somedata(ndo, cp, ep)) goto trunc;
+ ND_PRINT(")");
+ } else if (showsomedata) {
+ if (!ike_show_somedata(ndo, cp, ep))
+ goto trunc;
+ }
}
return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_N)));
+ ND_PRINT(" [|%s]", NPSTR(ISAKMP_NPTYPE_N));
return NULL;
}
static const u_char *
ikev2_d_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
ikev2_vid_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- struct isakmp_gen e;
const u_char *vid;
- int i, len;
+ u_int i, len;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
- ND_PRINT((ndo," len=%d vid=", ntohs(e.len) - 4));
+ ND_TCHECK_SIZE(ext);
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(ext->critical));
+
+ /*
+ * Our caller has ensured that the length is >= 4.
+ */
+ ND_PRINT(" len=%u vid=", item_len - 4);
vid = (const u_char *)(ext+1);
- len = ntohs(e.len) - 4;
- ND_TCHECK2(*vid, len);
+ len = item_len - 4;
+ ND_TCHECK_LEN(vid, len);
for(i=0; i<len; i++) {
- if(ND_ISPRINT(vid[i])) ND_PRINT((ndo, "%c", vid[i]));
- else ND_PRINT((ndo, "."));
+ if(ND_ISPRINT(EXTRACT_U_1(vid + i)))
+ ND_PRINT("%c", EXTRACT_U_1(vid + i));
+ else ND_PRINT(".");
}
if (2 < ndo->ndo_vflag && 4 < len) {
- ND_PRINT((ndo," "));
- if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4))
+ /* Print the entire payload in hex */
+ ND_PRINT(" ");
+ if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4))
goto trunc;
}
- return (const u_char *)ext + ntohs(e.len);
+ return (const u_char *)ext + item_len;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_TS_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
#ifndef HAVE_LIBCRYPTO
_U_
#endif
- struct isakmp *base,
+ const struct isakmp *base,
u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
#ifndef HAVE_LIBCRYPTO
_U_
#endif
#endif
int depth)
{
- struct isakmp_gen e;
const u_char *dat;
- volatile int dlen;
+ u_int dlen;
+#ifdef HAVE_LIBCRYPTO
+ uint8_t np;
+#endif
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
- ikev2_pay_print(ndo, NPSTR(tpay), e.critical);
+ ND_TCHECK_SIZE(ext);
+ ikev2_pay_print(ndo, NPSTR(tpay), EXTRACT_U_1(ext->critical));
- dlen = ntohs(e.len)-4;
+ dlen = item_len-4;
- ND_PRINT((ndo," len=%d", dlen));
+ ND_PRINT(" len=%u", dlen);
if (2 < ndo->ndo_vflag && 4 < dlen) {
- ND_PRINT((ndo," "));
+ ND_PRINT(" ");
if (!rawprint(ndo, (const uint8_t *)(ext + 1), dlen))
goto trunc;
}
dat = (const u_char *)(ext+1);
- ND_TCHECK2(*dat, dlen);
+ ND_TCHECK_LEN(dat, dlen);
#ifdef HAVE_LIBCRYPTO
+ np = EXTRACT_U_1(ext->np);
+
/* try to decypt it! */
if(esp_print_decrypt_buffer_by_ikev2(ndo,
- base->flags & ISAKMP_FLAG_I,
+ EXTRACT_U_1(base->flags) & ISAKMP_FLAG_I,
base->i_ck, base->r_ck,
dat, dat+dlen)) {
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);
+ ikev2_sub_print(ndo, base, np, ext,
+ ndo->ndo_snapend, phase, doi, proto, depth+1);
}
#endif
*/
return NULL;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(tpay)));
+ ND_PRINT(" [|%s]", NPSTR(tpay));
return NULL;
}
static const u_char *
ikev2_cp_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
ikev2_eap_print(netdissect_options *ndo, u_char tpay,
const struct isakmp_gen *ext,
- u_int item_len _U_, const u_char *ep _U_,
+ u_int item_len, const u_char *ep _U_,
uint32_t phase _U_, uint32_t doi _U_,
uint32_t proto _U_, int depth _U_)
{
- return ikev2_gen_print(ndo, tpay, ext);
+ return ikev2_gen_print(ndo, tpay, ext, item_len);
}
static const u_char *
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
{
const u_char *cp;
- struct isakmp_gen e;
u_int item_len;
cp = (const u_char *)ext;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
+ ND_TCHECK_SIZE(ext);
/*
* Since we can't have a payload length of less than 4 bytes,
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = ntohs(e.len);
+ item_len = EXTRACT_BE_U_2(ext->len);
if (item_len <= 4)
return NULL;
*/
cp = (*npfunc[np])(ndo, np, ext, item_len, ep, phase, doi, proto, depth);
} else {
- ND_PRINT((ndo,"%s", NPSTR(np)));
+ ND_PRINT("%s", NPSTR(np));
cp += item_len;
}
return cp;
trunc:
- ND_PRINT((ndo," [|isakmp]"));
+ nd_print_trunc(ndo);
return NULL;
}
{
const u_char *cp;
int i;
- struct isakmp_gen e;
+ u_int item_len;
cp = (const u_char *)ext;
while (np) {
- ND_TCHECK(*ext);
-
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
+ ND_TCHECK_SIZE(ext);
- ND_TCHECK2(*ext, ntohs(e.len));
+ item_len = EXTRACT_BE_U_2(ext->len);
+ ND_TCHECK_LEN(ext, item_len);
depth++;
- ND_PRINT((ndo,"\n"));
+ ND_PRINT("\n");
for (i = 0; i < depth; i++)
- ND_PRINT((ndo," "));
- ND_PRINT((ndo,"("));
+ ND_PRINT(" ");
+ ND_PRINT("(");
cp = ike_sub0_print(ndo, np, ext, ep, phase, doi, proto, depth);
- ND_PRINT((ndo,")"));
+ ND_PRINT(")");
depth--;
if (cp == NULL) {
return NULL;
}
- np = e.np;
+ np = EXTRACT_U_1(ext->np);
ext = (const struct isakmp_gen *)cp;
}
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(np)));
+ ND_PRINT(" [|%s]", NPSTR(np));
return NULL;
}
static char *
-numstr(int x)
+numstr(u_int x)
{
static char buf[20];
- snprintf(buf, sizeof(buf), "#%d", x);
+ nd_snprintf(buf, sizeof(buf), "#%u", x);
return buf;
}
static void
ikev1_print(netdissect_options *ndo,
const u_char *bp, u_int length,
- const u_char *bp2, struct isakmp *base)
+ const u_char *bp2, const struct isakmp *base)
{
const struct isakmp *p;
const u_char *ep;
+ u_int flags;
u_char np;
int i;
- int phase;
+ u_int phase;
p = (const struct isakmp *)bp;
ep = ndo->ndo_snapend;
- phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+ phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
if (phase == 1)
- ND_PRINT((ndo," phase %d", phase));
+ ND_PRINT(" phase %u", phase);
else
- ND_PRINT((ndo," phase %d/others", phase));
+ ND_PRINT(" phase %u/others", phase);
i = cookie_find(&base->i_ck);
if (i < 0) {
if (iszero((const u_char *)&base->r_ck, sizeof(base->r_ck))) {
/* the first packet */
- ND_PRINT((ndo," I"));
+ ND_PRINT(" I");
if (bp2)
- cookie_record(&base->i_ck, bp2);
+ cookie_record(ndo, &base->i_ck, bp2);
} else
- ND_PRINT((ndo," ?"));
+ ND_PRINT(" ?");
} else {
- if (bp2 && cookie_isinitiator(i, bp2))
- ND_PRINT((ndo," I"));
- else if (bp2 && cookie_isresponder(i, bp2))
- ND_PRINT((ndo," R"));
+ if (bp2 && cookie_isinitiator(ndo, i, bp2))
+ ND_PRINT(" I");
+ else if (bp2 && cookie_isresponder(ndo, i, bp2))
+ ND_PRINT(" R");
else
- ND_PRINT((ndo," ?"));
+ ND_PRINT(" ?");
}
- 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" : ""));
+ ND_PRINT(" %s", ETYPESTR(EXTRACT_U_1(base->etype)));
+ flags = EXTRACT_U_1(base->flags);
+ if (flags) {
+ ND_PRINT("[%s%s]", flags & ISAKMP_FLAG_E ? "E" : "",
+ flags & ISAKMP_FLAG_C ? "C" : "");
}
if (ndo->ndo_vflag) {
const struct isakmp_gen *ext;
- ND_PRINT((ndo,":"));
+ ND_PRINT(":");
+
+ np = EXTRACT_U_1(base->np);
/* regardless of phase... */
- if (base->flags & ISAKMP_FLAG_E) {
+ if (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)));
+ ND_PRINT(" [encrypted %s]", NPSTR(np));
goto done;
}
- CHECKLEN(p + 1, base->np);
- np = base->np;
+ CHECKLEN(p + 1, np);
ext = (const struct isakmp_gen *)(p + 1);
ikev1_sub_print(ndo, np, ext, ep, phase, 0, 0, 0);
}
done:
if (ndo->ndo_vflag) {
- if (ntohl(base->len) != length) {
- ND_PRINT((ndo," (len mismatch: isakmp %u/ip %u)",
- (uint32_t)ntohl(base->len), length));
+ if (EXTRACT_BE_U_4(base->len) != length) {
+ ND_PRINT(" (len mismatch: isakmp %u/ip %u)",
+ EXTRACT_BE_U_4(base->len), length);
}
}
}
static const u_char *
-ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base,
- u_char np, int pcount,
+ikev2_sub0_print(netdissect_options *ndo, const struct isakmp *base,
+ u_char np,
const struct isakmp_gen *ext, const u_char *ep,
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
{
const u_char *cp;
- struct isakmp_gen e;
u_int item_len;
cp = (const u_char *)ext;
- ND_TCHECK(*ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
+ ND_TCHECK_SIZE(ext);
/*
* Since we can't have a payload length of less than 4 bytes,
* or truncated, otherwise we could loop forever processing
* zero-length items or otherwise misdissect the packet.
*/
- item_len = ntohs(e.len);
+ item_len = EXTRACT_BE_U_2(ext->len);
if (item_len <= 4)
return NULL;
- if(np == ISAKMP_NPTYPE_P) {
- cp = ikev2_p_print(ndo, np, pcount, ext, item_len,
- ep, phase, doi, proto, depth);
- } else if(np == ISAKMP_NPTYPE_T) {
- cp = ikev2_t_print(ndo, np, pcount, ext, item_len,
- ep, phase, doi, proto, depth);
- } else if(np == ISAKMP_NPTYPE_v2E) {
+ if (np == ISAKMP_NPTYPE_v2E) {
cp = ikev2_e_print(ndo, base, np, ext, item_len,
ep, phase, doi, proto, depth);
} else if (NPFUNC(np)) {
* XXX - what if item_len is too short, or too long,
* for this payload type?
*/
- cp = (*npfunc[np])(ndo, np, /*pcount,*/ ext, item_len,
+ cp = (*npfunc[np])(ndo, np, ext, item_len,
ep, phase, doi, proto, depth);
} else {
- ND_PRINT((ndo,"%s", NPSTR(np)));
+ ND_PRINT("%s", NPSTR(np));
cp += item_len;
}
return cp;
trunc:
- ND_PRINT((ndo," [|isakmp]"));
+ nd_print_trunc(ndo);
return NULL;
}
static const u_char *
ikev2_sub_print(netdissect_options *ndo,
- struct isakmp *base,
+ const struct isakmp *base,
u_char np, const struct isakmp_gen *ext, const u_char *ep,
uint32_t phase, uint32_t doi, uint32_t proto, int depth)
{
const u_char *cp;
int i;
- int pcount;
- struct isakmp_gen e;
cp = (const u_char *)ext;
- pcount = 0;
while (np) {
- pcount++;
- ND_TCHECK(*ext);
+ ND_TCHECK_SIZE(ext);
- UNALIGNED_MEMCPY(&e, ext, sizeof(e));
-
- ND_TCHECK2(*ext, ntohs(e.len));
+ ND_TCHECK_LEN(ext, EXTRACT_BE_U_2(ext->len));
depth++;
- ND_PRINT((ndo,"\n"));
+ ND_PRINT("\n");
for (i = 0; i < depth; i++)
- ND_PRINT((ndo," "));
- ND_PRINT((ndo,"("));
- cp = ikev2_sub0_print(ndo, base, np, pcount,
+ ND_PRINT(" ");
+ ND_PRINT("(");
+ cp = ikev2_sub0_print(ndo, base, np,
ext, ep, phase, doi, proto, depth);
- ND_PRINT((ndo,")"));
+ ND_PRINT(")");
depth--;
if (cp == NULL) {
return NULL;
}
- np = e.np;
+ np = EXTRACT_U_1(ext->np);
ext = (const struct isakmp_gen *)cp;
}
return cp;
trunc:
- ND_PRINT((ndo," [|%s]", NPSTR(np)));
+ ND_PRINT(" [|%s]", NPSTR(np));
return NULL;
}
static void
ikev2_print(netdissect_options *ndo,
const u_char *bp, u_int length,
- const u_char *bp2 _U_, struct isakmp *base)
+ const u_char *bp2 _U_, const struct isakmp *base)
{
const struct isakmp *p;
const u_char *ep;
+ uint8_t flags;
u_char np;
- int phase;
+ u_int phase;
p = (const struct isakmp *)bp;
ep = ndo->ndo_snapend;
- phase = (EXTRACT_32BITS(base->msgid) == 0) ? 1 : 2;
+ phase = (EXTRACT_BE_U_4(base->msgid) == 0) ? 1 : 2;
if (phase == 1)
- ND_PRINT((ndo, " parent_sa"));
+ ND_PRINT(" parent_sa");
else
- ND_PRINT((ndo, " child_sa "));
+ ND_PRINT(" child_sa ");
- ND_PRINT((ndo, " %s", ETYPESTR(base->etype)));
- if (base->flags) {
- ND_PRINT((ndo, "[%s%s%s]",
- base->flags & ISAKMP_FLAG_I ? "I" : "",
- base->flags & ISAKMP_FLAG_V ? "V" : "",
- base->flags & ISAKMP_FLAG_R ? "R" : ""));
+ ND_PRINT(" %s", ETYPESTR(EXTRACT_U_1(base->etype)));
+ flags = EXTRACT_U_1(base->flags);
+ if (flags) {
+ ND_PRINT("[%s%s%s]",
+ flags & ISAKMP_FLAG_I ? "I" : "",
+ flags & ISAKMP_FLAG_V ? "V" : "",
+ flags & ISAKMP_FLAG_R ? "R" : "");
}
if (ndo->ndo_vflag) {
const struct isakmp_gen *ext;
- ND_PRINT((ndo, ":"));
+ ND_PRINT(":");
+
+ np = EXTRACT_U_1(base->np);
/* regardless of phase... */
- if (base->flags & ISAKMP_FLAG_E) {
+ if (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)));
+ ND_PRINT(" [encrypted %s]", NPSTR(np));
goto done;
}
- CHECKLEN(p + 1, base->np)
-
- np = base->np;
+ CHECKLEN(p + 1, np)
ext = (const struct isakmp_gen *)(p + 1);
ikev2_sub_print(ndo, base, np, ext, ep, phase, 0, 0, 0);
}
done:
if (ndo->ndo_vflag) {
- if (ntohl(base->len) != length) {
- ND_PRINT((ndo, " (len mismatch: isakmp %u/ip %u)",
- (uint32_t)ntohl(base->len), length));
+ if (EXTRACT_BE_U_4(base->len) != length) {
+ ND_PRINT(" (len mismatch: isakmp %u/ip %u)",
+ EXTRACT_BE_U_4(base->len), length);
}
}
}
const u_char *bp2)
{
const struct isakmp *p;
- struct isakmp base;
const u_char *ep;
- int major, minor;
+ u_int major, minor;
+ ndo->ndo_protocol = "isakmp";
#ifdef HAVE_LIBCRYPTO
/* initialize SAs */
if (ndo->ndo_sa_list_head == NULL) {
ep = ndo->ndo_snapend;
if ((const struct isakmp *)ep < p + 1) {
- ND_PRINT((ndo,"[|isakmp]"));
+ nd_print_trunc(ndo);
return;
}
- UNALIGNED_MEMCPY(&base, p, sizeof(base));
-
- ND_PRINT((ndo,"isakmp"));
- major = (base.vers & ISAKMP_VERS_MAJOR)
+ ND_PRINT("isakmp");
+ major = (EXTRACT_U_1(p->vers) & ISAKMP_VERS_MAJOR)
>> ISAKMP_VERS_MAJOR_SHIFT;
- minor = (base.vers & ISAKMP_VERS_MINOR)
+ minor = (EXTRACT_U_1(p->vers) & ISAKMP_VERS_MINOR)
>> ISAKMP_VERS_MINOR_SHIFT;
if (ndo->ndo_vflag) {
- ND_PRINT((ndo," %d.%d", major, minor));
+ ND_PRINT(" %u.%u", major, minor);
}
if (ndo->ndo_vflag) {
- ND_PRINT((ndo," msgid "));
- hexprint(ndo, (const uint8_t *)&base.msgid, sizeof(base.msgid));
+ ND_PRINT(" msgid ");
+ hexprint(ndo, p->msgid, sizeof(p->msgid));
}
if (1 < ndo->ndo_vflag) {
- ND_PRINT((ndo," cookie "));
- hexprint(ndo, (const uint8_t *)&base.i_ck, sizeof(base.i_ck));
- ND_PRINT((ndo,"->"));
- hexprint(ndo, (const uint8_t *)&base.r_ck, sizeof(base.r_ck));
+ ND_PRINT(" cookie ");
+ hexprint(ndo, p->i_ck, sizeof(p->i_ck));
+ ND_PRINT("->");
+ hexprint(ndo, p->r_ck, sizeof(p->r_ck));
}
- ND_PRINT((ndo,":"));
+ ND_PRINT(":");
switch(major) {
case IKEv1_MAJOR_VERSION:
- ikev1_print(ndo, bp, length, bp2, &base);
+ ikev1_print(ndo, bp, length, bp2, p);
break;
case IKEv2_MAJOR_VERSION:
- ikev2_print(ndo, bp, length, bp2, &base);
+ ikev2_print(ndo, bp, length, bp2, p);
break;
}
}
const u_char *bp, u_int length,
const u_char *bp2)
{
-
- if(length == 1 && bp[0]==0xff) {
- ND_PRINT((ndo, "isakmp-nat-keep-alive"));
+ ndo->ndo_protocol = "isakmp_rfc3948";
+ ND_TCHECK_1(bp);
+ if(length == 1 && EXTRACT_U_1(bp)==0xff) {
+ ND_PRINT("isakmp-nat-keep-alive");
return;
}
if(length < 4) {
goto trunc;
}
+ ND_TCHECK_1(bp + 3);
/*
* see if this is an IKE packet
*/
- if(bp[0]==0 && bp[1]==0 && bp[2]==0 && bp[3]==0) {
- ND_PRINT((ndo, "NONESP-encap: "));
+ if (EXTRACT_BE_U_4(bp) == 0) {
+ ND_PRINT("NONESP-encap: ");
isakmp_print(ndo, bp+4, length-4, bp2);
return;
}
/* must be an ESP packet */
{
- int nh, enh, padlen;
+ u_int nh, enh, padlen;
int advance;
- ND_PRINT((ndo, "UDP-encap: "));
+ ND_PRINT("UDP-encap: ");
advance = esp_print(ndo, bp, length, bp2, &enh, &padlen);
if(advance <= 0)
length -= advance + padlen;
nh = enh & 0xff;
- ip_print_inner(ndo, bp, length, nh, bp2);
+ ip_inner_print(ndo, bp, length, nh, bp2);
return;
}
trunc:
- ND_PRINT((ndo,"[|isakmp]"));
+ nd_print_trunc(ndo);
return;
}
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */
-
-
-
-
projects / tcpdump / blobdiff