X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d7b497cac78b6e22a66a6bae9bdec60a8044f67a..HEAD:/print-isakmp.c diff --git a/print-isakmp.c b/print-isakmp.c index fa9fa239..be5b0930 100644 --- a/print-isakmp.c +++ b/print-isakmp.c @@ -30,33 +30,26 @@ /* \summary: Internet Security Association and Key Management Protocol (ISAKMP) printer */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif +/* specification: RFC 2407, RFC 2408, RFC 5996 */ -/* 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 +#include -#include +#include "netdissect-stdinc.h" #include +#include "netdissect-ctype.h" + #include "netdissect.h" #include "addrtoname.h" #include "extract.h" #include "ip.h" #include "ip6.h" -#include "ipproto.h" +#include "ipproto.h" /* for netdb_protoname() */ -/* 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 @@ -79,16 +72,16 @@ typedef u_char msgid_t[4]; 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 */ @@ -120,9 +113,9 @@ struct isakmp { #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 */ +#define ISAKMP_FLAG_I (1 << 3) /* Initiator */ +#define ISAKMP_FLAG_V (1 << 4) /* Version */ +#define ISAKMP_FLAG_R (1 << 5) /* Response */ /* 3.2 Payload Generic Header @@ -132,9 +125,9 @@ struct isakmp { +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ 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 @@ -148,9 +141,9 @@ struct isakmp_gen { +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ */ 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 */ }; @@ -168,8 +161,8 @@ struct isakmp_data { */ 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 */ @@ -182,10 +175,10 @@ struct ikev1_pl_sa { */ 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 */ }; @@ -198,9 +191,9 @@ struct ikev1_pl_p { */ 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 */ }; @@ -215,8 +208,8 @@ struct ikev1_pl_ke { 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 */ }; @@ -224,8 +217,8 @@ struct ikev1_pl_id { /* 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 @@ -236,12 +229,12 @@ struct ikev1_pl_cert { /* 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, sorted in order of preference. Each individual certificate - type is 1 octet. This field is NOT requiredo + type is 1 octet. This field is NOT required. */ /* # Certificate Authorities (1 octet) */ /* Certificate Authorities (variable length) */ @@ -271,10 +264,10 @@ struct ikev1_pl_nonce { /* 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 */ }; @@ -311,43 +304,31 @@ struct ikev1_pl_n { /* 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 { @@ -361,8 +342,8 @@ 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 */ }; @@ -379,9 +360,9 @@ enum ikev2_id_type { }; 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 */ }; @@ -389,38 +370,94 @@ struct ikev2_id { /* 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 { - 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 + IV2_NOTIFY_UNSUPPORTED_CRITICAL_PAYLOAD = 1, /* [RFC7296] */ + IV2_NOTIFY_INVALID_IKE_SPI = 4, /* [RFC7296] */ + IV2_NOTIFY_INVALID_MAJOR_VERSION = 5, /* [RFC7296] */ + IV2_NOTIFY_INVALID_SYNTAX = 7, /* [RFC7296] */ + IV2_NOTIFY_INVALID_MESSAGE_ID = 9, /* [RFC7296] */ + IV2_NOTIFY_INVALID_SPI =11, /* [RFC7296] */ + IV2_NOTIFY_NO_PROPOSAL_CHOSEN =14, /* [RFC7296] */ + IV2_NOTIFY_INVALID_KE_PAYLOAD =17, /* [RFC7296] */ + IV2_NOTIFY_AUTHENTICATION_FAILED =24, /* [RFC7296] */ + IV2_NOTIFY_SINGLE_PAIR_REQUIRED =34, /* [RFC7296] */ + IV2_NOTIFY_NO_ADDITIONAL_SAS =35, /* [RFC7296] */ + IV2_NOTIFY_INTERNAL_ADDRESS_FAILURE =36, /* [RFC7296] */ + IV2_NOTIFY_FAILED_CP_REQUIRED =37, /* [RFC7296] */ + IV2_NOTIFY_TS_UNACCEPTABLE =38, /* [RFC7296] */ + IV2_NOTIFY_INVALID_SELECTORS =39, /* [RFC7296] */ + IV2_NOTIFY_UNACCEPTABLE_ADDRESSES =40, /* [RFC4555] */ + IV2_NOTIFY_UNEXPECTED_NAT_DETECTED =41, /* [RFC4555] */ + IV2_NOTIFY_USE_ASSIGNED_HOA =42, /* [RFC5026] */ + IV2_NOTIFY_TEMPORARY_FAILURE =43, /* [RFC7296] */ + IV2_NOTIFY_CHILD_SA_NOT_FOUND =44, /* [RFC7296] */ + IV2_NOTIFY_INVALID_GROUP_ID =45, /* [draft-yeung-g-ikev2] */ + IV2_NOTIFY_AUTHORIZATION_FAILED =46, /* [draft-yeung-g-ikev2] */ + IV2_NOTIFY_STATE_NOT_FOUND =47, /* [RFC-ietf-ipsecme-ikev2-multiple-ke-12] */ + IV2_NOTIFY_INITIAL_CONTACT =16384, /* [RFC7296] */ + IV2_NOTIFY_SET_WINDOW_SIZE =16385, /* [RFC7296] */ + IV2_NOTIFY_ADDITIONAL_TS_POSSIBLE =16386, /* [RFC7296] */ + IV2_NOTIFY_IPCOMP_SUPPORTED =16387, /* [RFC7296] */ + IV2_NOTIFY_NAT_DETECTION_SOURCE_IP =16388, /* [RFC7296] */ + IV2_NOTIFY_NAT_DETECTION_DESTINATION_IP =16389, /* [RFC7296] */ + IV2_NOTIFY_COOKIE =16390, /* [RFC7296] */ + IV2_NOTIFY_USE_TRANSPORT_MODE =16391, /* [RFC7296] */ + IV2_NOTIFY_HTTP_CERT_LOOKUP_SUPPORTED =16392, /* [RFC7296] */ + IV2_NOTIFY_REKEY_SA =16393, /* [RFC7296] */ + IV2_NOTIFY_ESP_TFC_PADDING_NOT_SUPPORTED =16394, /* [RFC7296] */ + IV2_NOTIFY_NON_FIRST_FRAGMENTS_ALSO =16395, /* [RFC7296] */ + IV2_NOTIFY_MOBIKE_SUPPORTED =16396, /* [RFC4555] */ + IV2_NOTIFY_ADDITIONAL_IP4_ADDRESS =16397, /* [RFC4555] */ + IV2_NOTIFY_ADDITIONAL_IP6_ADDRESS =16398, /* [RFC4555] */ + IV2_NOTIFY_NO_ADDITIONAL_ADDRESSES =16399, /* [RFC4555] */ + IV2_NOTIFY_UPDATE_SA_ADDRESSES =16400, /* [RFC4555] */ + IV2_NOTIFY_COOKIE2 =16401, /* [RFC4555] */ + IV2_NOTIFY_NO_NATS_ALLOWED =16402, /* [RFC4555] */ + IV2_NOTIFY_AUTH_LIFETIME =16403, /* [RFC4478] */ + IV2_NOTIFY_MULTIPLE_AUTH_SUPPORTED =16404, /* [RFC4739] */ + IV2_NOTIFY_ANOTHER_AUTH_FOLLOWS =16405, /* [RFC4739] */ + IV2_NOTIFY_REDIRECT_SUPPORTED =16406, /* [RFC5685] */ + IV2_NOTIFY_REDIRECT =16407, /* [RFC5685] */ + IV2_NOTIFY_REDIRECTED_FROM =16408, /* [RFC5685] */ + IV2_NOTIFY_TICKET_LT_OPAQUE =16409, /* [RFC5723] */ + IV2_NOTIFY_TICKET_REQUEST =16410, /* [RFC5723] */ + IV2_NOTIFY_TICKET_ACK =16411, /* [RFC5723] */ + IV2_NOTIFY_TICKET_NACK =16412, /* [RFC5723] */ + IV2_NOTIFY_TICKET_OPAQUE =16413, /* [RFC5723] */ + IV2_NOTIFY_LINK_ID =16414, /* [RFC5739] */ + IV2_NOTIFY_USE_WESP_MODE =16415, /* [RFC5840] */ + IV2_NOTIFY_ROHC_SUPPORTED =16416, /* [RFC5857] */ + IV2_NOTIFY_EAP_ONLY_AUTHENTICATION =16417, /* [RFC5998] */ + IV2_NOTIFY_CHILDLESS_IKEV2_SUPPORTED =16418, /* [RFC6023] */ + IV2_NOTIFY_QUICK_CRASH_DETECTION =16419, /* [RFC6290] */ + IV2_NOTIFY_IKEV2_MESSAGE_ID_SYNC_SUPPORTED =16420, /* [RFC6311] */ + IV2_NOTIFY_IPSEC_REPLAY_COUNTER_SYNC_SUPPORTED =16421, /* [RFC6311] */ + IV2_NOTIFY_IKEV2_MESSAGE_ID_SYNC =16422, /* [RFC6311] */ + IV2_NOTIFY_IPSEC_REPLAY_COUNTER_SYNC =16423, /* [RFC6311] */ + IV2_NOTIFY_SECURE_PASSWORD_METHODS =16424, /* [RFC6467] */ + IV2_NOTIFY_PSK_PERSIST =16425, /* [RFC6631] */ + IV2_NOTIFY_PSK_CONFIRM =16426, /* [RFC6631] */ + IV2_NOTIFY_ERX_SUPPORTED =16427, /* [RFC6867] */ + IV2_NOTIFY_IFOM_CAPABILITY =16428, /* [Frederic_Firmin][3GPP TS 24.303 v10.6.0 annex B.2] */ + IV2_NOTIFY_SENDER_REQUEST_ID =16429, /* [draft-yeung-g-ikev2] */ + IV2_NOTIFY_IKEV2_FRAGMENTATION_SUPPORTED =16430, /* [RFC7383] */ + IV2_NOTIFY_SIGNATURE_HASH_ALGORITHMS =16431, /* [RFC7427] */ + IV2_NOTIFY_CLONE_IKE_SA_SUPPORTED =16432, /* [RFC7791] */ + IV2_NOTIFY_CLONE_IKE_SA =16433, /* [RFC7791] */ + IV2_NOTIFY_PUZZLE =16434, /* [RFC8019] */ + IV2_NOTIFY_USE_PPK =16435, /* [RFC8784] */ + IV2_NOTIFY_PPK_IDENTITY =16436, /* [RFC8784] */ + IV2_NOTIFY_NO_PPK_AUTH =16437, /* [RFC8784] */ + IV2_NOTIFY_INTERMEDIATE_EXCHANGE_SUPPORTED =16438, /* [RFC9242] */ + IV2_NOTIFY_IP4_ALLOWED =16439, /* [RFC8983] */ + IV2_NOTIFY_IP6_ALLOWED =16440, /* [RFC8983] */ + IV2_NOTIFY_ADDITIONAL_KEY_EXCHANGE =16441, /* [RFC-ietf-ipsecme-ikev2-multiple-ke-12] */ + IV2_NOTIFY_USE_AGGFRAG =16442 /* [RFC9347] */ }; struct notify_messages { @@ -431,8 +468,8 @@ struct notify_messages { /* 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 */ }; @@ -540,21 +577,21 @@ struct oakley_sa { /* 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 */ }; @@ -614,7 +651,7 @@ DECLARE_PRINTER(v2_cp); 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, @@ -630,25 +667,25 @@ static const u_char *ikev1_sub_print(netdissect_options *ndo,u_char, const struc 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 static int ninitiator = 0; union inaddr_u { - struct in_addr in4; - struct in6_addr in6; + nd_ipv4 in4; + nd_ipv6 in6; }; static struct { cookie_t initiator; @@ -741,7 +778,7 @@ static const char *etypestr[] = { #define CHECKLEN(p, np) \ if (ep < (const u_char *)(p)) { \ - ND_PRINT((ndo," [|%s]", NPSTR(np))); \ + ND_PRINT(" [|%s]", NPSTR(np)); \ goto done; \ } @@ -751,18 +788,20 @@ static const char *etypestr[] = { ? npfunc[(x)] : NULL) static int -iszero(const u_char *p, size_t l) +iszero(netdissect_options *ndo, const u_char *p, size_t l) { - while (l--) { - if (*p++) + while (l != 0) { + if (GET_U_1(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; @@ -776,7 +815,7 @@ cookie_find(cookie_t *in) /* 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; @@ -792,14 +831,18 @@ cookie_record(cookie_t *in, const u_char *bp2) 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; @@ -808,10 +851,10 @@ cookie_record(cookie_t *in, const u_char *bp2) 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; @@ -822,10 +865,10 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator) 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; @@ -834,10 +877,10 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator) 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; @@ -856,13 +899,13 @@ hexprint(netdissect_options *ndo, const uint8_t *loc, size_t len) 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; @@ -879,8 +922,8 @@ static int ike_show_somedata(netdissect_options *ndo, { /* 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; } @@ -891,13 +934,13 @@ static int ike_show_somedata(netdissect_options *ndo, 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: @@ -915,48 +958,44 @@ ikev1_attrmap_print(netdissect_options *ndo, const u_char *p, const u_char *ep2, const struct attrmap *map, size_t nmap) { - int totlen; + u_int totlen; uint32_t t, v; - ND_TCHECK(p[0]); - if (p[0] & 0x80) + if (GET_U_1(p) & 0x80) totlen = 4; else { - ND_TCHECK_2(p + 2); - totlen = 4 + EXTRACT_BE_U_2(p + 2); + totlen = 4 + GET_BE_U_2(p + 2); } if (ep2 < p + totlen) { - ND_PRINT((ndo,"[|attr]")); + ND_PRINT("[|attr]"); return ep2 + 1; } - ND_TCHECK_2(p); - ND_PRINT((ndo,"(")); - t = EXTRACT_BE_U_2(p) & 0x7fff; + ND_PRINT("("); + t = GET_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=")); - ND_TCHECK_2(p + 2); - v = EXTRACT_BE_U_2(p + 2); + ND_PRINT("type=#%u ", t); + if (GET_U_1(p) & 0x80) { + ND_PRINT("value="); + v = GET_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])); + ND_PRINT("%s", map[t].value[v]); else { - if (!rawprint(ndo, (const uint8_t *)&p[2], 2)) { - ND_PRINT((ndo,")")); + if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) { + ND_PRINT(")"); goto trunc; } } } else { - ND_PRINT((ndo,"len=%d value=", totlen - 4)); - if (!rawprint(ndo, (const uint8_t *)&p[4], totlen - 4)) { - ND_PRINT((ndo,")")); + 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: @@ -966,40 +1005,37 @@ trunc: static const u_char * ikev1_attr_print(netdissect_options *ndo, const u_char *p, const u_char *ep2) { - int totlen; + u_int totlen; uint32_t t; - ND_TCHECK(p[0]); - if (p[0] & 0x80) + if (GET_U_1(p) & 0x80) totlen = 4; else { - ND_TCHECK_2(p + 2); - totlen = 4 + EXTRACT_BE_U_2(p + 2); + totlen = 4 + GET_BE_U_2(p + 2); } if (ep2 < p + totlen) { - ND_PRINT((ndo,"[|attr]")); + ND_PRINT("[|attr]"); return ep2 + 1; } - ND_TCHECK_2(p); - ND_PRINT((ndo,"(")); - t = EXTRACT_BE_U_2(p) & 0x7fff; - ND_PRINT((ndo,"type=#%d ", t)); - if (p[0] & 0x80) { - ND_PRINT((ndo,"value=")); - t = p[2]; - if (!rawprint(ndo, (const uint8_t *)&p[2], 2)) { - ND_PRINT((ndo,")")); + ND_PRINT("("); + t = GET_BE_U_2(p) & 0x7fff; + ND_PRINT("type=#%u ", t); + if (GET_U_1(p) & 0x80) { + ND_PRINT("value="); + t = GET_U_1(p + 2); + if (!rawprint(ndo, (const uint8_t *)(p + 2), 2)) { + ND_PRINT(")"); goto trunc; } } else { - ND_PRINT((ndo,"len=%d value=", totlen - 4)); - if (!rawprint(ndo, (const uint8_t *)&p[4], totlen - 4)) { - ND_PRINT((ndo,")")); + 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: @@ -1014,55 +1050,52 @@ ikev1_sa_print(netdissect_options *ndo, u_char tpay _U_, 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 = GET_BE_U_4(p->doi); + sit = GET_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))); + ident = GET_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; } @@ -1073,31 +1106,32 @@ ikev1_p_print(netdissect_options *ndo, u_char tpay _U_, 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", + GET_U_1(p->p_no), PROTOIDSTR(GET_U_1(p->prot_id)), + GET_U_1(p->num_t)); + spi_size = GET_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); + GET_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; } @@ -1182,7 +1216,7 @@ static const struct attrmap ipsec_t_map[] = { }; 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 */ @@ -1195,7 +1229,7 @@ static const struct attrmap encr_t_map[] = { 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", @@ -1236,37 +1270,35 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_, 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(GET_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(GET_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(GET_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(GET_U_1(p->t_id), ipcomp_p_map); map = ipsec_t_map; nmap = sizeof(ipsec_t_map)/sizeof(ipsec_t_map[0]); break; @@ -1278,9 +1310,9 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_, } if (idstr) - ND_PRINT((ndo," #%d id=%s ", t.t_no, idstr)); + ND_PRINT(" #%u id=%s ", GET_U_1(p->t_no), idstr); else - ND_PRINT((ndo," #%d id=%d ", t.t_no, t.t_id)); + ND_PRINT(" #%u id=%u ", GET_U_1(p->t_no), GET_U_1(p->t_id)); cp = (const u_char *)(p + 1); ep2 = (const u_char *)p + item_len; while (cp < ep && cp < ep2) { @@ -1292,35 +1324,35 @@ ikev1_t_print(netdissect_options *ndo, u_char tpay _U_, 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((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_KE))); + ND_PRINT("%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_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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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; } @@ -1332,7 +1364,6 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, { #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", }; @@ -1341,14 +1372,13 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, "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); @@ -1358,16 +1388,17 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, } #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(GET_U_1(p->d.id_type), idtypestr)); + ND_PRINT(" doi_data=%u", + GET_BE_U_4(p->d.doi_data) & 0xffffff); break; #ifdef USE_IPSECDOI_IN_PHASE1 @@ -1376,39 +1407,38 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, case 2: { const struct ipsecdoi_id *doi_p; - struct ipsecdoi_id doi_id; 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 = GET_U_1(doi_p->type); + ND_PRINT(" idtype=%s", STR_OR_ID(type, ipsecidtypestr)); /* A protocol ID of 0 DOES NOT mean IPPROTO_IP! */ - if (!ndo->ndo_nflag && doi_id.proto_id && (p_name = netdb_protoname(doi_id.proto_id)) != NULL) - ND_PRINT((ndo," protoid=%s", p_name)); + proto_id = GET_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", GET_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, GET_IPADDR_STRING(data)); len = 0; break; case IPSECDOI_ID_FQDN: case IPSECDOI_ID_USER_FQDN: { - int i; - ND_PRINT((ndo," len=%d ", len)); - for (i = 0; i < len; i++) - safeputchar(ndo, EXTRACT_U_1(data + i)); + ND_PRINT(" len=%u ", len); + nd_printjn(ndo, data, len); len = 0; break; } @@ -1416,59 +1446,71 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, { 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, - ipaddr_string(ndo, data), - EXTRACT_U_1(mask), EXTRACT_U_1(mask + 1), - EXTRACT_U_1(mask + 2), EXTRACT_U_1(mask + 3))); + mask = data + sizeof(nd_ipv4); + ND_PRINT(" len=%u %s/%u.%u.%u.%u", len, + GET_IPADDR_STRING(data), + GET_U_1(mask), GET_U_1(mask + 1), + GET_U_1(mask + 2), + GET_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, GET_IP6ADDR_STRING(data)); len = 0; break; case IPSECDOI_ID_IPV6_ADDR_SUBNET: { const u_char *mask; if (len < 32) - ND_PRINT((ndo," len=%d [bad: < 32]", len)); + 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, - ip6addr_string(ndo, data), - 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))); + ND_PRINT(" len=%u %s/0x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x", len, + GET_IP6ADDR_STRING(data), + GET_U_1(mask), GET_U_1(mask + 1), + GET_U_1(mask + 2), + GET_U_1(mask + 3), + GET_U_1(mask + 4), + GET_U_1(mask + 5), + GET_U_1(mask + 6), + GET_U_1(mask + 7), + GET_U_1(mask + 8), + GET_U_1(mask + 9), + GET_U_1(mask + 10), + GET_U_1(mask + 11), + GET_U_1(mask + 12), + GET_U_1(mask + 13), + GET_U_1(mask + 14), + GET_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, - ipaddr_string(ndo, data), - ipaddr_string(ndo, data + sizeof(struct in_addr)))); + ND_PRINT(" len=%u %s-%s", len, + GET_IPADDR_STRING(data), + GET_IPADDR_STRING(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, - ip6addr_string(ndo, data), - ip6addr_string(ndo, data + sizeof(struct in6_addr)))); + ND_PRINT(" len=%u %s-%s", len, + GET_IP6ADDR_STRING(data), + GET_IP6ADDR_STRING(data + sizeof(nd_ipv6))); } len = 0; break; @@ -1481,16 +1523,16 @@ ikev1_id_print(netdissect_options *ndo, u_char tpay _U_, } } 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; } @@ -1502,29 +1544,30 @@ ikev1_cert_print(netdissect_options *ndo, u_char tpay _U_, 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(GET_U_1(p->encode), certstr)); if (2 < ndo->ndo_vflag && 4 < item_len) { /* Print the entire payload in hex */ - ND_PRINT((ndo," ")); + 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; } @@ -1535,114 +1578,112 @@ ikev1_cr_print(netdissect_options *ndo, u_char tpay _U_, 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(GET_U_1(p->encode), certstr)); if (2 < ndo->ndo_vflag && 4 < item_len) { /* Print the entire payload in hex */ - ND_PRINT((ndo," ")); + 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_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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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("%s:", NPSTR(ISAKMP_NPTYPE_SIG)); - ND_PRINT((ndo,"%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_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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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("%s:", NPSTR(ISAKMP_NPTYPE_NONCE)); - ND_PRINT((ndo,"%s:", NPSTR(ISAKMP_NPTYPE_NONCE))); - - ND_TCHECK(*ext); - UNALIGNED_MEMCPY(&e, ext, sizeof(e)); + ND_TCHECK_SIZE(ext); /* * Our caller has ensured that the length is >= 4. */ - ND_PRINT((ndo," n len=%u", ntohs(e.len) - 4)); - if (ntohs(e.len) > 4) { + ND_PRINT(" n len=%u", item_len - 4); + if (item_len > 4) { if (ndo->ndo_vflag > 2) { - ND_PRINT((ndo, " ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + ND_PRINT(" "); + if (!rawprint(ndo, (const uint8_t *)(ext + 1), item_len - 4)) goto trunc; } else if (ndo->ndo_vflag > 1) { - ND_PRINT((ndo, " ")); + 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; } @@ -1653,11 +1694,12 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _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", @@ -1704,75 +1746,78 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_, #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 = GET_BE_U_4(p->doi); + proto = GET_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 = GET_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 = GET_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 = GET_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 = GET_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) { - 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((ndo," attrs=(")); + ND_PRINT(" attrs=("); while (cp < ep && cp < ep2) { cp = ikev1_attrmap_print(ndo, cp, ep2, map, nmap); if (cp == NULL) { - ND_PRINT((ndo,")")); + ND_PRINT(")"); goto trunc; } } - ND_PRINT((ndo,")")); + ND_PRINT(")"); break; } case IPSECDOI_NTYPE_REPLAY_STATUS: - ND_PRINT((ndo," status=(")); - ND_PRINT((ndo,"replay detection %sabled", - EXTRACT_BE_U_4(cp) ? "en" : "dis")); - ND_PRINT((ndo,")")); + ND_PRINT(" status=("); + ND_PRINT("replay detection %sabled", + GET_BE_U_4(cp) ? "en" : "dis"); + ND_PRINT(")"); break; default: /* @@ -1780,10 +1825,10 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_, * draft-ietf-ipsec-notifymsg-04. */ if (ndo->ndo_vflag > 3) { - ND_PRINT((ndo," data=(")); + ND_PRINT(" data=("); if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp)) goto trunc; - ND_PRINT((ndo,")")); + ND_PRINT(")"); } else { if (!ike_show_somedata(ndo, cp, ep)) goto trunc; @@ -1793,7 +1838,7 @@ ikev1_n_print(netdissect_options *ndo, u_char tpay _U_, } 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; } @@ -1804,66 +1849,70 @@ ikev1_d_print(netdissect_options *ndo, u_char tpay _U_, 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 = GET_BE_U_4(p->doi); + proto = GET_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(" doi=ipsec"); + ND_PRINT(" 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=")); + spi_size = GET_U_1(p->spi_size); + ND_PRINT(" spilen=%u", spi_size); + num_spi = GET_BE_U_2(p->num_spi); + ND_PRINT(" nspi=%u", num_spi); q = (const uint8_t *)(p + 1); - for (i = 0; i < ntohs(d.num_spi); i++) { - if (i != 0) - ND_PRINT((ndo,",")); - if (!rawprint(ndo, (const uint8_t *)q, d.spi_size)) - goto trunc; - q += d.spi_size; + if (spi_size) { + ND_PRINT(" spi="); + for (i = 0; i < num_spi; i++) { + if (i != 0) + ND_PRINT(","); + if (!rawprint(ndo, (const uint8_t *)q, spi_size)) + goto trunc; + 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("%s:", NPSTR(ISAKMP_NPTYPE_VID)); - ND_PRINT((ndo,"%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_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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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; } @@ -1874,31 +1923,33 @@ trunc: /************************************************************/ 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), GET_U_1(p->critical)); - ND_PRINT((ndo," len=%d", ntohs(e.len) - 4)); - if (2 < ndo->ndo_vflag && 4 < ntohs(e.len)) { + /* + * 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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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; } @@ -1908,8 +1959,8 @@ ikev2_t_print(netdissect_options *ndo, int tcount, 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; @@ -1917,16 +1968,16 @@ ikev2_t_print(netdissect_options *ndo, int tcount, 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), GET_U_1(p->h.critical)); - t_id = ntohs(t.t_id); + t_id = GET_BE_U_2(p->t_id); map = NULL; nmap = 0; - switch (t.t_type) { + t_type = GET_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; @@ -1955,13 +2006,13 @@ ikev2_t_print(netdissect_options *ndo, int tcount, } if (idstr) - ND_PRINT((ndo," #%u type=%s id=%s ", tcount, - 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 ", tcount, - 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) { @@ -1973,10 +2024,10 @@ ikev2_t_print(netdissect_options *ndo, int tcount, 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; } @@ -1986,51 +2037,49 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_, 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; - struct isakmp_gen e; u_int item_len; p = (const struct ikev2_p *)ext; - ND_TCHECK(*p); - UNALIGNED_MEMCPY(&prop, ext, sizeof(prop)); + ND_TCHECK_SIZE(p); - ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), prop.h.critical); + ikev2_pay_print(ndo, NPSTR(ISAKMP_NPTYPE_P), GET_U_1(p->h.critical)); /* * ikev2_sa_print() guarantees that this is >= 4. */ prop_length = oprop_length - 4; - ND_PRINT((ndo," #%u protoid=%s transform=%d len=%u", - prop.p_no, PROTOIDSTR(prop.prot_id), - prop.num_t, oprop_length)); + ND_PRINT(" #%u protoid=%s transform=%u len=%u", + GET_U_1(p->p_no), PROTOIDSTR(GET_U_1(p->prot_id)), + GET_U_1(p->num_t), oprop_length); cp = (const u_char *)(p + 1); - if (prop.spi_size) { - if (prop_length < prop.spi_size) + spi_size = GET_U_1(p->spi_size); + if (spi_size) { + if (prop_length < spi_size) goto toolong; - ND_PRINT((ndo," spi=")); - if (!rawprint(ndo, (const uint8_t *)cp, prop.spi_size)) + ND_PRINT(" spi="); + if (!rawprint(ndo, (const uint8_t *)cp, spi_size)) goto trunc; - cp += prop.spi_size; - prop_length -= prop.spi_size; + cp += spi_size; + prop_length -= spi_size; } /* * Print the transforms. */ tcount = 0; - for (np = ISAKMP_NPTYPE_T; np != 0; np = e.np) { + for (np = ISAKMP_NPTYPE_T; np != 0; np = GET_U_1(ext->np)) { tcount++; ext = (const struct isakmp_gen *)cp; if (prop_length < sizeof(*ext)) goto toolong; - 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, @@ -2038,19 +2087,19 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_, * or truncated, otherwise we could loop forever processing * zero-length items or otherwise misdissect the packet. */ - item_len = ntohs(e.len); + item_len = GET_BE_U_2(ext->len); if (item_len <= 4) goto trunc; if (prop_length < item_len) goto toolong; - ND_TCHECK2(*cp, item_len); + ND_TCHECK_LEN(cp, 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("("); if (np == ISAKMP_NPTYPE_T) { cp = ikev2_t_print(ndo, tcount, ext, item_len, ep); if (cp == NULL) { @@ -2058,10 +2107,10 @@ ikev2_p_print(netdissect_options *ndo, u_char tpay _U_, int pcount _U_, return NULL; } } else { - ND_PRINT((ndo, "%s", NPSTR(np))); + ND_PRINT("%s", NPSTR(np)); cp += item_len; } - ND_PRINT((ndo,")")); + ND_PRINT(")"); depth--; prop_length -= item_len; } @@ -2071,10 +2120,10 @@ toolong: * Skip the rest of the proposal. */ cp += prop_length; - ND_PRINT((ndo," [|%s]", NPSTR(ISAKMP_NPTYPE_P))); + 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; } @@ -2086,7 +2135,6 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay, uint32_t proto _U_, int depth) { const struct isakmp_gen *ext; - struct isakmp_gen e; u_int sa_length; const u_char *cp; int i; @@ -2094,29 +2142,27 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay, 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", GET_U_1(ext1->critical)); /* * ikev2_sub0_print() guarantees that this is >= 4. */ - osa_length= ntohs(e.len); + osa_length= GET_BE_U_2(ext1->len); sa_length = osa_length - 4; - ND_PRINT((ndo," len=%d", sa_length)); + ND_PRINT(" len=%u", sa_length); /* * Print the payloads. */ cp = (const u_char *)(ext1 + 1); pcount = 0; - for (np = ISAKMP_NPTYPE_P; np != 0; np = e.np) { + for (np = ISAKMP_NPTYPE_P; np != 0; np = GET_U_1(ext->np)) { pcount++; ext = (const struct isakmp_gen *)cp; if (sa_length < sizeof(*ext)) goto toolong; - 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, @@ -2124,19 +2170,19 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay, * or truncated, otherwise we could loop forever processing * zero-length items or otherwise misdissect the packet. */ - item_len = ntohs(e.len); + item_len = GET_BE_U_2(ext->len); if (item_len <= 4) goto trunc; if (sa_length < item_len) goto toolong; - ND_TCHECK2(*cp, item_len); + ND_TCHECK_LEN(cp, 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("("); if (np == ISAKMP_NPTYPE_P) { cp = ikev2_p_print(ndo, np, pcount, ext, item_len, ep, depth); @@ -2145,10 +2191,10 @@ ikev2_sa_print(netdissect_options *ndo, u_char tpay, return NULL; } } else { - ND_PRINT((ndo, "%s", NPSTR(np))); + ND_PRINT("%s", NPSTR(np)); cp += item_len; } - ND_PRINT((ndo,")")); + ND_PRINT(")"); depth--; sa_length -= item_len; } @@ -2158,214 +2204,207 @@ toolong: * Skip the rest of the SA. */ cp += sa_length; - ND_PRINT((ndo," [|%s]", NPSTR(tpay))); + 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(*k); - 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), GET_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(GET_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_) { const struct ikev2_id *idp; - struct ikev2_id id; - int id_len, idtype_len, i; + u_int idtype_len; unsigned int dumpascii, dumphex; const unsigned char *typedata; idp = (const struct ikev2_id *)ext; - ND_TCHECK(*idp); - UNALIGNED_MEMCPY(&id, ext, sizeof(id)); - ikev2_pay_print(ndo, NPSTR(tpay), id.h.critical); + ND_TCHECK_SIZE(idp); + ikev2_pay_print(ndo, NPSTR(tpay), GET_U_1(idp->h.critical)); - id_len = ntohs(id.h.len); - - ND_PRINT((ndo," len=%d", id_len - 4)); - if (2 < ndo->ndo_vflag && 4 < id_len) { + /* + * 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((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), id_len - 4)) + 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(GET_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); - for(i=0; ih.critical)); /* * Our caller has ensured that the length is >= 4. */ - ND_PRINT((ndo," len=%u method=%s", len-4, - STR_OR_ID(a.auth_method, v2_auth))); - if (len > 4) { + ND_PRINT(" len=%u method=%s", item_len-4, + STR_OR_ID(GET_U_1(p->auth_method), v2_auth)); + if (item_len > 4) { if (ndo->ndo_vflag > 1) { - ND_PRINT((ndo, " authdata=(")); - if (!rawprint(ndo, (const uint8_t *)authdata, len - sizeof(a))) + ND_PRINT(" authdata=("); + if (!rawprint(ndo, (const uint8_t *)authdata, item_len - sizeof(struct ikev2_auth))) goto trunc; - ND_PRINT((ndo, ") ")); + 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", GET_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; } @@ -2378,30 +2417,28 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, 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, 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), GET_U_1(p->h.critical)); - showspi = 1; + showspi=0; showsomedata=0; notify_name=NULL; - ND_PRINT((ndo," prot_id=%s", PROTOIDSTR(n.prot_id))); + ND_PRINT(" prot_id=%s", PROTOIDSTR(GET_U_1(p->prot_id))); - type = ntohs(n.type); + type = GET_BE_U_2(p->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: @@ -2411,7 +2448,6 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, case IV2_NOTIFY_INVALID_MAJOR_VERSION: notify_name = "invalid_major_version"; - showspi = 0; break; case IV2_NOTIFY_INVALID_SYNTAX: @@ -2430,7 +2466,7 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, break; case IV2_NOTIFY_NO_PROPOSAL_CHOSEN: - notify_name = "no_protocol_chosen"; + notify_name = "no_proposal_chosen"; showspi = 1; break; @@ -2451,42 +2487,70 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, 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; case IV2_NOTIFY_FAILED_CP_REQUIRED: - notify_name = "failed:cp_required"; - showspi = 0; + notify_name = "failed_cp_required"; + break; + + case IV2_NOTIFY_TS_UNACCEPTABLE: + notify_name = "ts_unacceptable"; break; case IV2_NOTIFY_INVALID_SELECTORS: notify_name = "invalid_selectors"; - showspi = 0; + break; + + case IV2_NOTIFY_UNACCEPTABLE_ADDRESSES: + notify_name = "unacceptable_addresses"; + break; + + case IV2_NOTIFY_UNEXPECTED_NAT_DETECTED: + notify_name = "unexpected_nat_detected"; + break; + + case IV2_NOTIFY_USE_ASSIGNED_HOA: + notify_name = "use_assigned_hoa"; + break; + + case IV2_NOTIFY_TEMPORARY_FAILURE: + notify_name = "temporary_failure"; + break; + + case IV2_NOTIFY_CHILD_SA_NOT_FOUND: + notify_name = "child_sa_not_found"; + break; + + case IV2_NOTIFY_INVALID_GROUP_ID: + notify_name = "invalid_group_id"; + break; + + case IV2_NOTIFY_AUTHORIZATION_FAILED: + notify_name = "authorization_failed"; + break; + + case IV2_NOTIFY_STATE_NOT_FOUND: + notify_name = "state_not_found"; break; case IV2_NOTIFY_INITIAL_CONTACT: notify_name = "initial_contact"; - showspi = 0; break; case IV2_NOTIFY_SET_WINDOW_SIZE: notify_name = "set_window_size"; - showspi = 0; break; case IV2_NOTIFY_ADDITIONAL_TS_POSSIBLE: notify_name = "additional_ts_possible"; - showspi = 0; break; case IV2_NOTIFY_IPCOMP_SUPPORTED: notify_name = "ipcomp_supported"; - showspi = 0; break; case IV2_NOTIFY_NAT_DETECTION_SOURCE_IP: @@ -2507,12 +2571,10 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, 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: @@ -2522,15 +2584,202 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, 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; + + case IV2_NOTIFY_MOBIKE_SUPPORTED: + notify_name = "mobike_supported"; + break; + + case IV2_NOTIFY_ADDITIONAL_IP4_ADDRESS: + notify_name = "additional_ip4_address"; + break; + + case IV2_NOTIFY_ADDITIONAL_IP6_ADDRESS: + notify_name = "additional_ip6_address"; + break; + + case IV2_NOTIFY_NO_ADDITIONAL_ADDRESSES: + notify_name = "no_additional_addresses"; + break; + + case IV2_NOTIFY_UPDATE_SA_ADDRESSES: + notify_name = "update_sa_addresses"; + break; + + case IV2_NOTIFY_COOKIE2: + notify_name = "cookie2"; + break; + + case IV2_NOTIFY_NO_NATS_ALLOWED: + notify_name = "no_nats_allowed"; + break; + + case IV2_NOTIFY_AUTH_LIFETIME: + notify_name = "auth_lifetime"; + break; + + case IV2_NOTIFY_MULTIPLE_AUTH_SUPPORTED: + notify_name = "multiple_auth_supported"; + break; + + case IV2_NOTIFY_ANOTHER_AUTH_FOLLOWS: + notify_name = "another_auth_follows"; + break; + + case IV2_NOTIFY_REDIRECT_SUPPORTED: + notify_name = "redirect_supported"; + break; + + case IV2_NOTIFY_REDIRECT: + notify_name = "redirect"; + break; + + case IV2_NOTIFY_REDIRECTED_FROM: + notify_name = "redirected_from"; + break; + + case IV2_NOTIFY_TICKET_LT_OPAQUE: + notify_name = "ticket_lt_opaque"; + break; + + case IV2_NOTIFY_TICKET_REQUEST: + notify_name = "ticket_request"; + break; + + case IV2_NOTIFY_TICKET_ACK: + notify_name = "ticket_ack"; + break; + + case IV2_NOTIFY_TICKET_NACK: + notify_name = "ticket_nack"; + break; + + case IV2_NOTIFY_TICKET_OPAQUE: + notify_name = "ticket_opaque"; + break; + + case IV2_NOTIFY_LINK_ID: + notify_name = "link_id"; + break; + + case IV2_NOTIFY_USE_WESP_MODE: + notify_name = "use_wesp_mode"; + break; + + case IV2_NOTIFY_ROHC_SUPPORTED: + notify_name = "rohc_supported"; + break; + + case IV2_NOTIFY_EAP_ONLY_AUTHENTICATION: + notify_name = "eap_only_authentication"; + break; + + case IV2_NOTIFY_CHILDLESS_IKEV2_SUPPORTED: + notify_name = "childless_ikev2_supported"; + break; + + case IV2_NOTIFY_QUICK_CRASH_DETECTION: + notify_name = "quick_crash_detection"; + break; + + case IV2_NOTIFY_IKEV2_MESSAGE_ID_SYNC_SUPPORTED: + notify_name = "ikev2_message_id_sync_supported"; + break; + + case IV2_NOTIFY_IPSEC_REPLAY_COUNTER_SYNC_SUPPORTED: + notify_name = "ipsec_replay_counter_sync_supported"; + break; + + case IV2_NOTIFY_IKEV2_MESSAGE_ID_SYNC: + notify_name = "ikev2_message_id_sync"; + break; + + case IV2_NOTIFY_IPSEC_REPLAY_COUNTER_SYNC: + notify_name = "ipsec_replay_counter_sync"; + break; + + case IV2_NOTIFY_SECURE_PASSWORD_METHODS: + notify_name = "secure_password_methods"; + break; + + case IV2_NOTIFY_PSK_PERSIST: + notify_name = "psk_persist"; + break; + + case IV2_NOTIFY_PSK_CONFIRM: + notify_name = "psk_confirm"; + break; + + case IV2_NOTIFY_ERX_SUPPORTED: + notify_name = "erx_supported"; + break; + + case IV2_NOTIFY_IFOM_CAPABILITY: + notify_name = "ifom_capability"; + break; + + case IV2_NOTIFY_SENDER_REQUEST_ID: + notify_name = "sender_request_id"; + break; + + case IV2_NOTIFY_IKEV2_FRAGMENTATION_SUPPORTED: + notify_name = "ikev2_fragmentation_supported"; + break; + + case IV2_NOTIFY_SIGNATURE_HASH_ALGORITHMS: + notify_name = "signature_hash_algorithms"; + break; + + case IV2_NOTIFY_CLONE_IKE_SA_SUPPORTED: + notify_name = "clone_ike_sa_supported"; + break; + + case IV2_NOTIFY_CLONE_IKE_SA: + notify_name = "clone_ike_sa"; + break; + + case IV2_NOTIFY_PUZZLE: + notify_name = "puzzle"; + break; + + case IV2_NOTIFY_USE_PPK: + notify_name = "use_ppk"; + break; + + case IV2_NOTIFY_PPK_IDENTITY: + notify_name = "ppk_identity"; + break; + + case IV2_NOTIFY_NO_PPK_AUTH: + notify_name = "no_ppk_auth"; + break; + + case IV2_NOTIFY_INTERMEDIATE_EXCHANGE_SUPPORTED: + notify_name = "intermediate_exchange_supported"; + break; + + case IV2_NOTIFY_IP4_ALLOWED: + notify_name = "ip4_allowed"; + break; + + case IV2_NOTIFY_IP6_ALLOWED: + notify_name = "ip6_allowed"; + break; + + case IV2_NOTIFY_ADDITIONAL_KEY_EXCHANGE: + notify_name = "additional_key_exchange"; + break; + + case IV2_NOTIFY_USE_AGGFRAG: + notify_name = "use_aggfrag"; break; default: + showspi = 1; if (type < 8192) { notify_name="error"; } else if(type < 16384) { @@ -2543,25 +2792,26 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, } 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 = GET_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; + cp = (const u_char *)(p + 1) + spi_size; if (cp < ep) { if (ndo->ndo_vflag > 3 || (showsomedata && ep-cp < 30)) { - ND_PRINT((ndo," data=(")); + ND_PRINT(" data=("); if (!rawprint(ndo, (const uint8_t *)(cp), ep - cp)) goto trunc; - ND_PRINT((ndo,")")); + ND_PRINT(")"); } else if (showsomedata) { if (!ike_show_somedata(ndo, cp, ep)) goto trunc; @@ -2570,64 +2820,62 @@ ikev2_n_print(netdissect_options *ndo, u_char tpay _U_, 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 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), GET_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); - for(i=0; indo_vflag && 4 < len) { /* Print the entire payload in hex */ - ND_PRINT((ndo," ")); - if (!rawprint(ndo, (const uint8_t *)(ext + 1), ntohs(e.len) - 4)) + 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 * @@ -2635,10 +2883,10 @@ ikev2_e_print(netdissect_options *ndo, #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 @@ -2656,38 +2904,48 @@ ikev2_e_print(netdissect_options *ndo, #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), GET_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 - /* try to decypt it! */ - if(esp_print_decrypt_buffer_by_ikev2(ndo, - base->flags & ISAKMP_FLAG_I, + np = GET_U_1(ext->np); + + /* try to decrypt it! */ + if(esp_decrypt_buffer_by_ikev2_print(ndo, + GET_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); + + /* + * esp_decrypt_buffer_by_ikev2_print pushed information + * on the buffer stack; we're done with the buffer, so + * pop it (which frees the buffer) + */ + nd_pop_packet_info(ndo); } #endif @@ -2697,28 +2955,28 @@ ikev2_e_print(netdissect_options *ndo, */ 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 * @@ -2728,12 +2986,10 @@ ike_sub0_print(netdissect_options *ndo, 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, @@ -2741,7 +2997,7 @@ ike_sub0_print(netdissect_options *ndo, * or truncated, otherwise we could loop forever processing * zero-length items or otherwise misdissect the packet. */ - item_len = ntohs(e.len); + item_len = GET_BE_U_2(ext->len); if (item_len <= 4) return NULL; @@ -2752,13 +3008,13 @@ ike_sub0_print(netdissect_options *ndo, */ 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; } @@ -2769,23 +3025,23 @@ ikev1_sub_print(netdissect_options *ndo, { 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 = GET_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) { @@ -2793,110 +3049,111 @@ ikev1_sub_print(netdissect_options *ndo, return NULL; } - np = e.np; + np = GET_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); + 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_BE_U_4(base->msgid) == 0) ? 1 : 2; + phase = (GET_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))) { + if (iszero(ndo, 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(GET_U_1(base->etype))); + flags = GET_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 = GET_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 (GET_BE_U_4(base->len) != length) { + ND_PRINT(" (len mismatch: isakmp %u/ip %u)", + GET_BE_U_4(base->len), length); } } } static const u_char * -ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base, +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, @@ -2904,7 +3161,7 @@ ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base, * or truncated, otherwise we could loop forever processing * zero-length items or otherwise misdissect the packet. */ - item_len = ntohs(e.len); + item_len = GET_BE_U_2(ext->len); if (item_len <= 4) return NULL; @@ -2919,41 +3176,39 @@ ikev2_sub0_print(netdissect_options *ndo, struct isakmp *base, 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; - struct isakmp_gen e; 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)); + ND_TCHECK_LEN(ext, GET_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,"(")); + 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) { @@ -2961,69 +3216,71 @@ ikev2_sub_print(netdissect_options *ndo, return NULL; } - np = e.np; + np = GET_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_BE_U_4(base->msgid) == 0) ? 1 : 2; + phase = (GET_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(GET_U_1(base->etype))); + flags = GET_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 = GET_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 (GET_BE_U_4(base->len) != length) { + ND_PRINT(" (len mismatch: isakmp %u/ip %u)", + GET_BE_U_4(base->len), length); } } } @@ -3034,15 +3291,15 @@ isakmp_print(netdissect_options *ndo, 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) { if (ndo->ndo_espsecret) - esp_print_decodesecret(ndo); + esp_decodesecret_print(ndo); } #endif @@ -3050,42 +3307,40 @@ isakmp_print(netdissect_options *ndo, 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 = (GET_U_1(p->vers) & ISAKMP_VERS_MAJOR) >> ISAKMP_VERS_MAJOR_SHIFT; - minor = (base.vers & ISAKMP_VERS_MINOR) + minor = (GET_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; } } @@ -3093,55 +3348,42 @@ isakmp_print(netdissect_options *ndo, void isakmp_rfc3948_print(netdissect_options *ndo, const u_char *bp, u_int length, - const u_char *bp2) + const u_char *bp2, int ver, int fragmented, u_int ttl_hl) { - ND_TCHECK(bp[0]); - if(length == 1 && bp[0]==0xff) { - ND_PRINT((ndo, "isakmp-nat-keep-alive")); + ndo->ndo_protocol = "isakmp_rfc3948"; + if(length == 1 && GET_U_1(bp)==0xff) { + ND_PRINT("isakmp-nat-keep-alive"); return; } if(length < 4) { goto trunc; } - ND_TCHECK(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 (GET_BE_U_4(bp) == 0) { + ND_PRINT("NONESP-encap: "); isakmp_print(ndo, bp+4, length-4, bp2); return; } /* must be an ESP packet */ { - 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) - return; + esp_print(ndo, bp, length, bp2, ver, fragmented, ttl_hl); - bp += advance; - length -= advance + padlen; - nh = enh & 0xff; - - ip_print_inner(ndo, bp, length, nh, bp2); + /* + * Either this has decrypted the payload and + * printed it, in which case there's nothing more + * to do, or it hasn't, in which case there's + * nothing more to do. + */ return; } trunc: - ND_PRINT((ndo,"[|isakmp]")); - return; + nd_print_trunc(ndo); } - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */