do not use gcc-ism for macro, instead abuse C-syntax

[tcpdump] / print-isakmp.c

diff --git a/print-isakmp.c b/print-isakmp.c
index 106d3479d9a8dfa4d3b920c376f010de817643cd..e6f8f82d4db5667fe556aa9eab0ac324ae9314dd 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -29,8 +29,8 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.34 2002-09-05 00:43:21 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-isakmp.c,v 1.48 2004-03-25 03:31:05 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -60,31 +60,31 @@ static const char rcsid[] =
 #endif
 
 static const u_char *isakmp_sa_print(const struct isakmp_gen *,
 #endif
 
 static const u_char *isakmp_sa_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_p_print(const struct isakmp_gen *,
 static const u_char *isakmp_p_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_t_print(const struct isakmp_gen *,
 static const u_char *isakmp_t_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_ke_print(const struct isakmp_gen *,
 static const u_char *isakmp_ke_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_id_print(const struct isakmp_gen *,
 static const u_char *isakmp_id_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_cert_print(const struct isakmp_gen *,
 static const u_char *isakmp_cert_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_cr_print(const struct isakmp_gen *,
 static const u_char *isakmp_cr_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_sig_print(const struct isakmp_gen *,
 static const u_char *isakmp_sig_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_hash_print(const struct isakmp_gen *,
 static const u_char *isakmp_hash_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_nonce_print(const struct isakmp_gen *,
 static const u_char *isakmp_nonce_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_n_print(const struct isakmp_gen *,
 static const u_char *isakmp_n_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_d_print(const struct isakmp_gen *,
 static const u_char *isakmp_d_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_vid_print(const struct isakmp_gen *,
 static const u_char *isakmp_vid_print(const struct isakmp_gen *,

-       const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
+       u_int, const u_char *, u_int32_t, u_int32_t, u_int32_t, int);

 static const u_char *isakmp_sub0_print(u_char, const struct isakmp_gen *,
        const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
 static const u_char *isakmp_sub_print(u_char, const struct isakmp_gen *,
 static const u_char *isakmp_sub0_print(u_char, const struct isakmp_gen *,
        const u_char *, u_int32_t, u_int32_t, u_int32_t, int);
 static const u_char *isakmp_sub_print(u_char, const struct isakmp_gen *,


@@ -112,8 +112,8 @@ static const char *npstr[] = {
 };
 
 /* isakmp->np */
 };
 
 /* isakmp->np */

-static const u_char *(*npfunc[])(const struct isakmp_gen *, const u_char *,
-               u_int32_t, u_int32_t, u_int32_t, int) = {
+static const u_char *(*npfunc[])(const struct isakmp_gen *, u_int,
+               const u_char *, u_int32_t, u_int32_t, u_int32_t, int) = {

        NULL,
        isakmp_sa_print,
        isakmp_p_print,
        NULL,
        isakmp_sa_print,
        isakmp_p_print,


@@ -321,15 +321,20 @@ cookie_sidecheck(int i, const u_char *bp2, int initiator)
        return 0;
 }
 
        return 0;
 }
 

-static void
+static int

 rawprint(caddr_t loc, size_t len)
 {
        static u_char *p;
        size_t i;
 
 rawprint(caddr_t loc, size_t len)
 {
        static u_char *p;
        size_t i;
 

+       TCHECK2(*loc, len);
+       

        p = (u_char *)loc;
        for (i = 0; i < len; i++)
                printf("%02x", p[i] & 0xff);
        p = (u_char *)loc;
        for (i = 0; i < len; i++)
                printf("%02x", p[i] & 0xff);

+       return 1;
+trunc:
+       return 0;

 }
 
 struct attrmap {
 }
 
 struct attrmap {


@@ -350,28 +355,28 @@ isakmp_attrmap_print(const u_char *p, const u_char *ep,
        if (p[0] & 0x80)
                totlen = 4;
        else
        if (p[0] & 0x80)
                totlen = 4;
        else

-               totlen = 4 + ntohs(q[1]);
+               totlen = 4 + EXTRACT_16BITS(&q[1]);

        if (ep < p + totlen) {
                printf("[|attr]");
                return ep + 1;
        }
 
        printf("(");
        if (ep < p + totlen) {
                printf("[|attr]");
                return ep + 1;
        }
 
        printf("(");

-       t = ntohs(q[0]) & 0x7fff;
+       t = EXTRACT_16BITS(&q[0]) & 0x7fff;

        if (map && t < nmap && map[t].type)
                printf("type=%s ", map[t].type);
        else
                printf("type=#%d ", t);
        if (p[0] & 0x80) {
                printf("value=");
        if (map && t < nmap && map[t].type)
                printf("type=%s ", map[t].type);
        else
                printf("type=#%d ", t);
        if (p[0] & 0x80) {
                printf("value=");

-               v = ntohs(q[1]);
+               v = EXTRACT_16BITS(&q[1]);

                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        printf("%s", map[t].value[v]);
                else
                        rawprint((caddr_t)&q[1], 2);
        } else {
                if (map && t < nmap && v < map[t].nvalue && map[t].value[v])
                        printf("%s", map[t].value[v]);
                else
                        rawprint((caddr_t)&q[1], 2);
        } else {

-               printf("len=%d value=", ntohs(q[1]));
-               rawprint((caddr_t)&p[4], ntohs(q[1]));
+               printf("len=%d value=", EXTRACT_16BITS(&q[1]));
+               rawprint((caddr_t)&p[4], EXTRACT_16BITS(&q[1]));

        }
        printf(")");
        return p + totlen;
        }
        printf(")");
        return p + totlen;


@@ -388,30 +393,32 @@ isakmp_attr_print(const u_char *p, const u_char *ep)
        if (p[0] & 0x80)
                totlen = 4;
        else
        if (p[0] & 0x80)
                totlen = 4;
        else

-               totlen = 4 + ntohs(q[1]);
+               totlen = 4 + EXTRACT_16BITS(&q[1]);

        if (ep < p + totlen) {
                printf("[|attr]");
                return ep + 1;
        }
 
        printf("(");
        if (ep < p + totlen) {
                printf("[|attr]");
                return ep + 1;
        }
 
        printf("(");

-       t = ntohs(q[0]) & 0x7fff;
+       t = EXTRACT_16BITS(&q[0]) & 0x7fff;

        printf("type=#%d ", t);
        if (p[0] & 0x80) {
                printf("value=");
                t = q[1];
                rawprint((caddr_t)&q[1], 2);
        } else {
        printf("type=#%d ", t);
        if (p[0] & 0x80) {
                printf("value=");
                t = q[1];
                rawprint((caddr_t)&q[1], 2);
        } else {

-               printf("len=%d value=", ntohs(q[1]));
-               rawprint((caddr_t)&p[2], ntohs(q[1]));
+               printf("len=%d value=", EXTRACT_16BITS(&q[1]));
+               rawprint((caddr_t)&p[2], EXTRACT_16BITS(&q[1]));

        }
        printf(")");
        return p + totlen;
 }
 
 static const u_char *
        }
        printf(")");
        return p + totlen;
 }
 
 static const u_char *

-isakmp_sa_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_sa_print(const struct isakmp_gen *ext,
+               u_int item_len _U_,
+               const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
+               u_int32_t proto0, int depth)

 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;
 {
        const struct isakmp_pl_sa *p;
        struct isakmp_pl_sa sa;


@@ -423,6 +430,7 @@ isakmp_sa_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_SA));
 
        p = (struct isakmp_pl_sa *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_SA));
 
        p = (struct isakmp_pl_sa *)ext;

+       TCHECK(*p);

        safememcpy(&sa, ext, sizeof(sa));
        doi = ntohl(sa.doi);
        sit = ntohl(sa.sit);
        safememcpy(&sa, ext, sizeof(sa));
        doi = ntohl(sa.doi);
        sit = ntohl(sa.sit);


@@ -449,22 +457,28 @@ isakmp_sa_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
 
        np = (u_char *)ext + sizeof(sa);
        if (sit != 0x01) {
 
        np = (u_char *)ext + sizeof(sa);
        if (sit != 0x01) {

+               TCHECK2(*(ext + 1), sizeof(ident));

                safememcpy(&ident, ext + 1, sizeof(ident));
                printf(" ident=%u", (u_int32_t)ntohl(ident));
                np += sizeof(ident);
        }
 
        ext = (struct isakmp_gen *)np;
                safememcpy(&ident, ext + 1, sizeof(ident));
                printf(" ident=%u", (u_int32_t)ntohl(ident));
                np += sizeof(ident);
        }
 
        ext = (struct isakmp_gen *)np;

+       TCHECK(*ext);

 
        cp = isakmp_sub_print(ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,
                depth);
 
        return cp;
 
        cp = isakmp_sub_print(ISAKMP_NPTYPE_P, ext, ep, phase, doi, proto0,
                depth);
 
        return cp;

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_SA));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_p_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_p_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep, u_int32_t phase, u_int32_t doi0,
+              u_int32_t proto0 _U_, int depth)

 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;
 {
        const struct isakmp_pl_p *p;
        struct isakmp_pl_p prop;


@@ -473,20 +487,26 @@ isakmp_p_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_P));
 
        p = (struct isakmp_pl_p *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_P));
 
        p = (struct isakmp_pl_p *)ext;

+       TCHECK(*p);

        safememcpy(&prop, ext, sizeof(prop));
        printf(" #%d protoid=%s transform=%d",
                prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t);
        if (prop.spi_size) {
                printf(" spi=");
        safememcpy(&prop, ext, sizeof(prop));
        printf(" #%d protoid=%s transform=%d",
                prop.p_no, PROTOIDSTR(prop.prot_id), prop.num_t);
        if (prop.spi_size) {
                printf(" spi=");

-               rawprint((caddr_t)(p + 1), prop.spi_size);
+               if (!rawprint((caddr_t)(p + 1), prop.spi_size))
+                       goto trunc;

        }
 
        ext = (struct isakmp_gen *)((u_char *)(p + 1) + prop.spi_size);
        }
 
        ext = (struct isakmp_gen *)((u_char *)(p + 1) + prop.spi_size);

+       TCHECK(*ext);

 
        cp = isakmp_sub_print(ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
                prop.prot_id, depth);
 
        return cp;
 
        cp = isakmp_sub_print(ISAKMP_NPTYPE_T, ext, ep, phase, doi0,
                prop.prot_id, depth);
 
        return cp;

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_P));
+       return NULL;

 }
 
 static const char *isakmp_p_map[] = {
 }
 
 static const char *isakmp_p_map[] = {


@@ -546,8 +566,9 @@ const struct attrmap oakley_t_map[] = {
 };
 
 static const u_char *
 };
 
 static const u_char *

-isakmp_t_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi, u_int32_t proto, int depth)
+isakmp_t_print(const struct isakmp_gen *ext, u_int item_len,
+       const u_char *ep, u_int32_t phase _U_, u_int32_t doi _U_,
+       u_int32_t proto, int depth _U_)

 {
        const struct isakmp_pl_t *p;
        struct isakmp_pl_t t;
 {
        const struct isakmp_pl_t *p;
        struct isakmp_pl_t t;


@@ -560,6 +581,7 @@ isakmp_t_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_T));
 
        p = (struct isakmp_pl_t *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_T));
 
        p = (struct isakmp_pl_t *)ext;

+       TCHECK(*p);

        safememcpy(&t, ext, sizeof(t));
 
        switch (proto) {
        safememcpy(&t, ext, sizeof(t));
 
        switch (proto) {


@@ -595,7 +617,7 @@ isakmp_t_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        else
                printf(" #%d id=%d ", t.t_no, t.t_id);
        cp = (u_char *)(p + 1);
        else
                printf(" #%d id=%d ", t.t_no, t.t_id);
        cp = (u_char *)(p + 1);

-       ep2 = (u_char *)p + ntohs(t.h.len);
+       ep2 = (u_char *)p + item_len;

        while (cp < ep && cp < ep2) {
                if (map && nmap) {
                        cp = isakmp_attrmap_print(cp, (ep < ep2) ? ep : ep2,
        while (cp < ep && cp < ep2) {
                if (map && nmap) {
                        cp = isakmp_attrmap_print(cp, (ep < ep2) ? ep : ep2,


@@ -606,28 +628,38 @@ isakmp_t_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        if (ep < ep2)
                printf("...");
        return cp;
        if (ep < ep2)
                printf("...");
        return cp;

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_T));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_ke_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi, u_int32_t proto, int depth)
+isakmp_ke_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_KE));
 
 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_KE));
 

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
        printf(" key len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");
        safememcpy(&e, ext, sizeof(e));
        printf(" key len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4))
+                       goto trunc;

        }
        return (u_char *)ext + ntohs(e.len);
        }
        return (u_char *)ext + ntohs(e.len);

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_KE));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi, u_int32_t proto, int depth)
+isakmp_id_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase, u_int32_t doi _U_,
+               u_int32_t proto _U_, int depth _U_)

 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;
 {
 #define USE_IPSECDOI_IN_PHASE1 1
        const struct isakmp_pl_id *p;


@@ -646,12 +678,15 @@ isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_ID));
 
        p = (struct isakmp_pl_id *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_ID));
 
        p = (struct isakmp_pl_id *)ext;

+       TCHECK(*p);

        safememcpy(&id, ext, sizeof(id));
        safememcpy(&id, ext, sizeof(id));

-       if (sizeof(*p) < id.h.len)
+       if (sizeof(*p) < item_len) {

                data = (u_char *)(p + 1);
                data = (u_char *)(p + 1);

-       else
+               len = item_len - sizeof(*p);
+       } else {

                data = NULL;
                data = NULL;

-       len = ntohs(id.h.len) - sizeof(*p);
+               len = 0;
+       }

 
 #if 0 /*debug*/
        printf(" [phase=%d doi=%d proto=%d]", phase, doi, proto);
 
 #if 0 /*debug*/
        printf(" [phase=%d doi=%d proto=%d]", phase, doi, proto);


@@ -676,6 +711,7 @@ isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                struct protoent *pe;
 
                p = (struct ipsecdoi_id *)ext;
                struct protoent *pe;
 
                p = (struct ipsecdoi_id *)ext;

+               TCHECK(*p);

                safememcpy(&id, ext, sizeof(id));
                printf(" idtype=%s", STR_OR_ID(id.type, ipsecidtypestr));
                if (id.proto_id) {
                safememcpy(&id, ext, sizeof(id));
                printf(" idtype=%s", STR_OR_ID(id.type, ipsecidtypestr));
                if (id.proto_id) {


@@ -695,9 +731,15 @@ isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                printf(" port=%d", ntohs(id.port));
                if (!len)
                        break;
                printf(" port=%d", ntohs(id.port));
                if (!len)
                        break;

+               if (data == NULL)
+                       goto trunc;
+               TCHECK2(*data, len);

                switch (id.type) {
                case IPSECDOI_ID_IPV4_ADDR:
                switch (id.type) {
                case IPSECDOI_ID_IPV4_ADDR:

-                       printf(" len=%d %s", len, ipaddr_string(data));
+                       if (len < 4)
+                               printf(" len=%d [bad: < 4]", len);
+                       else
+                               printf(" len=%d %s", len, ipaddr_string(data));

                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:
                        len = 0;
                        break;
                case IPSECDOI_ID_FQDN:


@@ -713,39 +755,60 @@ isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                case IPSECDOI_ID_IPV4_ADDR_SUBNET:
                    {
                        const u_char *mask;
                case IPSECDOI_ID_IPV4_ADDR_SUBNET:
                    {
                        const u_char *mask;

-                       mask = data + sizeof(struct in_addr);
-                       printf(" len=%d %s/%u.%u.%u.%u", len,
-                               ipaddr_string(data),
-                               mask[0], mask[1], mask[2], mask[3]);
+                       if (len < 8)
+                               printf(" len=%d [bad: < 8]", len);
+                       else {
+                               mask = data + sizeof(struct in_addr);
+                               printf(" len=%d %s/%u.%u.%u.%u", len,
+                                       ipaddr_string(data),
+                                       mask[0], mask[1], mask[2], mask[3]);
+                       }

                        len = 0;
                        break;
                    }
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR:
                        len = 0;
                        break;
                    }
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR:

-                       printf(" len=%d %s", len, ip6addr_string(data));
+                       if (len < 16)
+                               printf(" len=%d [bad: < 16]", len);
+                       else
+                               printf(" len=%d %s", len, ip6addr_string(data));

                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {
                        const u_int32_t *mask;
                        len = 0;
                        break;
                case IPSECDOI_ID_IPV6_ADDR_SUBNET:
                    {
                        const u_int32_t *mask;

-                       mask = (u_int32_t *)(data + sizeof(struct in6_addr));
-                       /*XXX*/
-                       printf(" len=%d %s/0x%08x%08x%08x%08x", len,
-                               ip6addr_string(data),
-                               mask[0], mask[1], mask[2], mask[3]);
+                       if (len < 20)
+                               printf(" len=%d [bad: < 20]", len);
+                       else {
+                               mask = (u_int32_t *)(data + sizeof(struct in6_addr));
+                               /*XXX*/
+                               printf(" len=%d %s/0x%08x%08x%08x%08x", len,
+                                       ip6addr_string(data),
+                                       mask[0], mask[1], mask[2], mask[3]);
+                       }

                        len = 0;
                        break;
                    }
 #endif /*INET6*/
                case IPSECDOI_ID_IPV4_ADDR_RANGE:
                        len = 0;
                        break;
                    }
 #endif /*INET6*/
                case IPSECDOI_ID_IPV4_ADDR_RANGE:

-                       printf(" len=%d %s-%s", len, ipaddr_string(data),
-                               ipaddr_string(data + sizeof(struct in_addr)));
+                       if (len < 8)
+                               printf(" len=%d [bad: < 8]", len);
+                       else {
+                               printf(" len=%d %s-%s", len,
+                                       ipaddr_string(data),
+                                       ipaddr_string(data + sizeof(struct in_addr)));
+                       }

                        len = 0;
                        break;
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR_RANGE:
                        len = 0;
                        break;
 #ifdef INET6
                case IPSECDOI_ID_IPV6_ADDR_RANGE:

-                       printf(" len=%d %s-%s", len, ip6addr_string(data),
-                               ip6addr_string(data + sizeof(struct in6_addr)));
+                       if (len < 32)
+                               printf(" len=%d [bad: < 32]", len);
+                       else {
+                               printf(" len=%d %s-%s", len,
+                                       ip6addr_string(data),
+                                       ip6addr_string(data + sizeof(struct in6_addr)));
+                       }

                        len = 0;
                        break;
 #endif /*INET6*/
                        len = 0;
                        break;
 #endif /*INET6*/


@@ -761,15 +824,21 @@ isakmp_id_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                printf(" len=%d", len);
                if (2 < vflag) {
                        printf(" ");
                printf(" len=%d", len);
                if (2 < vflag) {
                        printf(" ");

-                       rawprint((caddr_t)data, len);
+                       if (!rawprint((caddr_t)data, len))
+                               goto trunc;

                }
        }
                }
        }

-       return (u_char *)ext + ntohs(id.h.len);
+       return (u_char *)ext + item_len;
+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_ID));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cert_print(const struct isakmp_gen *ext, const u_char *ep,
-       u_int32_t phase, u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_cert_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_,
+                 u_int32_t doi0 _U_,
+                 u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -782,19 +851,25 @@ isakmp_cert_print(const struct isakmp_gen *ext, const u_char *ep,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_CERT));
 
        p = (struct isakmp_pl_cert *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_CERT));
 
        p = (struct isakmp_pl_cert *)ext;

+       TCHECK(*p);

        safememcpy(&cert, ext, sizeof(cert));
        safememcpy(&cert, ext, sizeof(cert));

-       printf(" len=%d", ntohs(cert.h.len) - 4);
+       printf(" len=%d", item_len - 4);

        printf(" type=%s", STR_OR_ID((cert.encode), certstr));
        printf(" type=%s", STR_OR_ID((cert.encode), certstr));

-       if (2 < vflag && 4 < ntohs(cert.h.len)) {
+       if (2 < vflag && 4 < item_len) {

                printf(" ");
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(cert.h.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), item_len - 4))
+                       goto trunc;

        }
        }

-       return (u_char *)ext + ntohs(cert.h.len);
+       return (u_char *)ext + item_len;
+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_CERT));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_cr_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_cr_print(const struct isakmp_gen *ext, u_int item_len _U_,
+               const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+               u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;
 {
        const struct isakmp_pl_cert *p;
        struct isakmp_pl_cert cert;


@@ -807,70 +882,96 @@ isakmp_cr_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_CR));
 
        p = (struct isakmp_pl_cert *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_CR));
 
        p = (struct isakmp_pl_cert *)ext;

+       TCHECK(*p);

        safememcpy(&cert, ext, sizeof(cert));
        safememcpy(&cert, ext, sizeof(cert));

-       printf(" len=%d", ntohs(cert.h.len) - 4);
+       printf(" len=%d", item_len - 4);

        printf(" type=%s", STR_OR_ID((cert.encode), certstr));
        printf(" type=%s", STR_OR_ID((cert.encode), certstr));

-       if (2 < vflag && 4 < ntohs(cert.h.len)) {
+       if (2 < vflag && 4 < item_len) {

                printf(" ");
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(cert.h.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), item_len - 4))
+                       goto trunc;

        }
        }

-       return (u_char *)ext + ntohs(cert.h.len);
+       return (u_char *)ext + item_len;
+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_CR));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_hash_print(const struct isakmp_gen *ext, const u_char *ep,
-       u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+isakmp_hash_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                 const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                 u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_HASH));
 
 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_HASH));
 

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");
        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4))
+                       goto trunc;

        }
        return (u_char *)ext + ntohs(e.len);
        }
        return (u_char *)ext + ntohs(e.len);

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_HASH));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_sig_print(const struct isakmp_gen *ext, const u_char *ep,
-       u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+isakmp_sig_print(const struct isakmp_gen *ext, u_int item_len _U_,
+                const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_SIG));
 
 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_SIG));
 

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");
        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4))
+                       goto trunc;

        }
        return (u_char *)ext + ntohs(e.len);
        }
        return (u_char *)ext + ntohs(e.len);

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_SIG));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_nonce_print(const struct isakmp_gen *ext, const u_char *ep,
-       u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+isakmp_nonce_print(const struct isakmp_gen *ext,
+                  u_int item_len _U_,
+                  const u_char *ep _U_,
+                  u_int32_t phase _U_, u_int32_t doi _U_,
+                  u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_NONCE));
 
 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_NONCE));
 

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
        printf(" n len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");
        safememcpy(&e, ext, sizeof(e));
        printf(" n len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4))
+                       goto trunc;

        }
        return (u_char *)ext + ntohs(e.len);
        }
        return (u_char *)ext + ntohs(e.len);

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_NONCE));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_n_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_n_print(const struct isakmp_gen *ext, u_int item_len,
+       const u_char *ep, u_int32_t phase, u_int32_t doi0 _U_,
+       u_int32_t proto0 _U_, int depth)

 {
        struct isakmp_pl_n *p, n;
        const u_char *cp;
 {
        struct isakmp_pl_n *p, n;
        const u_char *cp;


@@ -926,6 +1027,7 @@ isakmp_n_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_N));
 
        p = (struct isakmp_pl_n *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_N));
 
        p = (struct isakmp_pl_n *)ext;

+       TCHECK(*p);

        safememcpy(&n, ext, sizeof(n));
        doi = ntohl(n.doi);
        proto = n.prot_id;
        safememcpy(&n, ext, sizeof(n));
        doi = ntohl(n.doi);
        proto = n.prot_id;


@@ -942,7 +1044,8 @@ isakmp_n_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                        printf(" type=%s", numstr(ntohs(n.type)));
                if (n.spi_size) {
                        printf(" spi=");
                        printf(" type=%s", numstr(ntohs(n.type)));
                if (n.spi_size) {
                        printf(" spi=");

-                       rawprint((caddr_t)(p + 1), n.spi_size);
+                       if (!rawprint((caddr_t)(p + 1), n.spi_size))
+                               goto trunc;

                }
                return (u_char *)(p + 1) + n.spi_size;
        }
                }
                return (u_char *)(p + 1) + n.spi_size;
        }


@@ -961,11 +1064,12 @@ isakmp_n_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                printf(" type=%s", numstr(ntohs(n.type)));
        if (n.spi_size) {
                printf(" spi=");
                printf(" type=%s", numstr(ntohs(n.type)));
        if (n.spi_size) {
                printf(" spi=");

-               rawprint((caddr_t)(p + 1), n.spi_size);
+               if (!rawprint((caddr_t)(p + 1), n.spi_size))
+                       goto trunc;

        }
 
        cp = (u_char *)(p + 1) + n.spi_size;
        }
 
        cp = (u_char *)(p + 1) + n.spi_size;

-       ep2 = (u_char *)p + ntohs(n.h.len);
+       ep2 = (u_char *)p + item_len;

 
        if (cp < ep) {
                printf(" orig=(");
 
        if (cp < ep) {
                printf(" orig=(");


@@ -992,18 +1096,21 @@ isakmp_n_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
                        break;
                default:
                        /* NULL is dummy */
                        break;
                default:
                        /* NULL is dummy */

-                       isakmp_print(cp,
-                               ntohs(n.h.len) - sizeof(*p) - n.spi_size,
+                       isakmp_print(cp, item_len - sizeof(*p) - n.spi_size,

                                NULL);
                }
                printf(")");
        }
                                NULL);
                }
                printf(")");
        }

-       return (u_char *)ext + ntohs(n.h.len);
+       return (u_char *)ext + item_len;
+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_N));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_d_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
-       u_int32_t doi0, u_int32_t proto0, int depth)
+isakmp_d_print(const struct isakmp_gen *ext, u_int item_len _U_,
+              const u_char *ep _U_, u_int32_t phase _U_, u_int32_t doi0 _U_,
+              u_int32_t proto0 _U_, int depth _U_)

 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;
 {
        const struct isakmp_pl_d *p;
        struct isakmp_pl_d d;


@@ -1015,6 +1122,7 @@ isakmp_d_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        printf("%s:", NPSTR(ISAKMP_NPTYPE_D));
 
        p = (struct isakmp_pl_d *)ext;
        printf("%s:", NPSTR(ISAKMP_NPTYPE_D));
 
        p = (struct isakmp_pl_d *)ext;

+       TCHECK(*p);

        safememcpy(&d, ext, sizeof(d));
        doi = ntohl(d.doi);
        proto = d.prot_id;
        safememcpy(&d, ext, sizeof(d));
        doi = ntohl(d.doi);
        proto = d.prot_id;


@@ -1032,27 +1140,38 @@ isakmp_d_print(const struct isakmp_gen *ext, const u_char *ep, u_int32_t phase,
        for (i = 0; i < ntohs(d.num_spi); i++) {
                if (i != 0)
                        printf(",");
        for (i = 0; i < ntohs(d.num_spi); i++) {
                if (i != 0)
                        printf(",");

-               rawprint((caddr_t)q, d.spi_size);
+               if (!rawprint((caddr_t)q, d.spi_size))
+                       goto trunc;

                q += d.spi_size;
        }
        return q;
                q += d.spi_size;
        }
        return q;

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_D));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *

-isakmp_vid_print(const struct isakmp_gen *ext, const u_char *ep,
-       u_int32_t phase, u_int32_t doi, u_int32_t proto, int depth)
+isakmp_vid_print(const struct isakmp_gen *ext,
+                u_int item_len _U_, const u_char *ep _U_,
+                u_int32_t phase _U_, u_int32_t doi _U_,
+                u_int32_t proto _U_, int depth _U_)

 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_VID));
 
 {
        struct isakmp_gen e;
 
        printf("%s:", NPSTR(ISAKMP_NPTYPE_VID));
 

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");
        safememcpy(&e, ext, sizeof(e));
        printf(" len=%d", ntohs(e.len) - 4);
        if (2 < vflag && 4 < ntohs(e.len)) {
                printf(" ");

-               rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4);
+               if (!rawprint((caddr_t)(ext + 1), ntohs(e.len) - 4))
+                       goto trunc;

        }
        return (u_char *)ext + ntohs(e.len);
        }
        return (u_char *)ext + ntohs(e.len);

+trunc:
+       printf(" [|%s]", NPSTR(ISAKMP_NPTYPE_VID));
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *


@@ -1064,25 +1183,34 @@ isakmp_sub0_print(u_char np, const struct isakmp_gen *ext, const u_char *ep,
        u_int item_len;
 
        cp = (u_char *)ext;
        u_int item_len;
 
        cp = (u_char *)ext;

+       TCHECK(*ext);

        safememcpy(&e, ext, sizeof(e));
 
        safememcpy(&e, ext, sizeof(e));
 

-       if (NPFUNC(np))
-               cp = (*NPFUNC(np))(ext, ep, phase, doi, proto, depth);
-       else {
+       /*
+        * Since we can't have a payload length of less than 4 bytes,
+        * we need to bail out here if the generic header is nonsensical
+        * or truncated, otherwise we could loop forever processing
+        * zero-length items or otherwise misdissect the packet.
+        */
+       item_len = ntohs(e.len);
+       if (item_len <= 4)
+               return NULL;
+
+       if (NPFUNC(np)) {
+               /*
+                * XXX - what if item_len is too short, or too long,
+                * for this payload type?
+                */
+               cp = (*NPFUNC(np))(ext, item_len, ep, phase, doi, proto, depth);
+       } else {

                printf("%s", NPSTR(np));
                printf("%s", NPSTR(np));

-               item_len = ntohs(e.len);
-               if (item_len == 0) {
-                       /*
-                        * We don't want to loop forever processing this
-                        * bogus (zero-length) item; return NULL so that
-                        * we stop dissecting.
-                        */
-                       cp = NULL;
-               } else
-                       cp += item_len;
+               cp += item_len;

        }
 
        return cp;
        }
 
        return cp;

+trunc:
+       printf(" [|isakmp]");
+       return NULL;

 }
 
 static const u_char *
 }
 
 static const u_char *


@@ -1096,13 +1224,12 @@ isakmp_sub_print(u_char np, const struct isakmp_gen *ext, const u_char *ep,
        cp = (const u_char *)ext;
 
        while (np) {
        cp = (const u_char *)ext;
 
        while (np) {

+               TCHECK(*ext);
+               

                safememcpy(&e, ext, sizeof(e));
 
                safememcpy(&e, ext, sizeof(e));
 

-               if (ep < (u_char *)ext + ntohs(e.len)) {
-                       printf(" [|%s]", NPSTR(np));
-                       cp = ep + 1;
-                       break;
-               }
+               TCHECK2(*ext, ntohs(e.len));
+

                depth++;
                printf("\n");
                for (i = 0; i < depth; i++)
                depth++;
                printf("\n");
                for (i = 0; i < depth; i++)


@@ -1121,6 +1248,9 @@ isakmp_sub_print(u_char np, const struct isakmp_gen *ext, const u_char *ep,
                ext = (struct isakmp_gen *)cp;
        }
        return cp;
                ext = (struct isakmp_gen *)cp;
        }
        return cp;

+trunc:
+       printf(" [|%s]", NPSTR(np));
+       return NULL;

 }
 
 static char *
 }
 
 static char *


@@ -1214,40 +1344,41 @@ isakmp_print(const u_char *bp, u_int length, const u_char *bp2)
                printf("[%s%s]", base.flags & ISAKMP_FLAG_E ? "E" : "",
                        base.flags & ISAKMP_FLAG_C ? "C" : "");
        }
                printf("[%s%s]", base.flags & ISAKMP_FLAG_E ? "E" : "",
                        base.flags & ISAKMP_FLAG_C ? "C" : "");
        }

-       printf(":");

 
 

-    {
-       const struct isakmp_gen *ext;
-       int nparen;
+       if (vflag) {
+               const struct isakmp_gen *ext;
+               int nparen;

 
 #define CHECKLEN(p, np) \
 
 #define CHECKLEN(p, np) \

-       if (ep < (u_char *)(p)) {                               \
-               printf(" [|%s]", NPSTR(np));                    \
-               goto done;                                      \
-       }
+               if (ep < (u_char *)(p)) {                               \
+                       printf(" [|%s]", NPSTR(np));                    \
+                       goto done;                                      \
+               }

 
 

-       /* regardless of phase... */
-       if (base.flags & ISAKMP_FLAG_E) {
-               /*
-                * encrypted, nothing we can do right now.
-                * we hope to decrypt the packet in the future...
-                */
-               printf(" [encrypted %s]", NPSTR(base.np));
-               goto done;
-       }
+               printf(":");
+
+               /* regardless of phase... */
+               if (base.flags & ISAKMP_FLAG_E) {
+                       /*
+                        * encrypted, nothing we can do right now.
+                        * we hope to decrypt the packet in the future...
+                        */
+                       printf(" [encrypted %s]", NPSTR(base.np));
+                       goto done;
+               }

 
 

-       nparen = 0;
-       CHECKLEN(p + 1, base.np)
+               nparen = 0;
+               CHECKLEN(p + 1, base.np)

 
 

-       np = base.np;
-       ext = (struct isakmp_gen *)(p + 1);
-       isakmp_sub_print(np, ext, ep, phase, 0, 0, 0);
-    }
+               np = base.np;
+               ext = (struct isakmp_gen *)(p + 1);
+               isakmp_sub_print(np, ext, ep, phase, 0, 0, 0);
+       }

 
 done:
        if (vflag) {
                if (ntohl(base.len) != length) {
 
 done:
        if (vflag) {
                if (ntohl(base.len) != length) {

-                       printf(" (len mismatch: isakmp %u/ip %d)",
+                       printf(" (len mismatch: isakmp %u/ip %u)",

                                (u_int32_t)ntohl(base.len), length);
                }
        }
                                (u_int32_t)ntohl(base.len), length);
                }
        }