Fix warnings when building for 32-bit and defining _TIME_BITS=64

[tcpdump] / print-eap.c

diff --git a/print-eap.c b/print-eap.c
index fba40e2721fcd910262669a51d519e6f5bced96f..e640e83dd46208610e402f4698d62c5e87b9bdc9 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -16,24 +16,18 @@
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
  * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

- *
- * Format and print EAP packets.
- *

  */
 
  */
 

+/* \summary: Extensible Authentication Protocol (EAP) printer */
+

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 
 #include "netdissect.h"

-#include "interface.h"

 #include "extract.h"
 #include "extract.h"

-#include "ether.h"

 
 #define        EAP_FRAME_TYPE_PACKET           0
 #define        EAP_FRAME_TYPE_START            1
 
 #define        EAP_FRAME_TYPE_PACKET           0
 #define        EAP_FRAME_TYPE_START            1


@@ -42,25 +36,25 @@
 #define        EAP_FRAME_TYPE_ENCAP_ASF_ALERT  4
 
 struct eap_frame_t {
 #define        EAP_FRAME_TYPE_ENCAP_ASF_ALERT  4
 
 struct eap_frame_t {

-    unsigned char   version;
-    unsigned char   type;
-    unsigned char   length[2];
+    nd_uint8_t  version;
+    nd_uint8_t  type;
+    nd_uint16_t length;

 };
 
 static const struct tok eap_frame_type_values[] = {
 };
 
 static const struct tok eap_frame_type_values[] = {

-    { EAP_FRAME_TYPE_PACKET,           "EAP packet" },
-    { EAP_FRAME_TYPE_START,                    "EAPOL start" },
-    { EAP_FRAME_TYPE_LOGOFF,           "EAPOL logoff" },
-    { EAP_FRAME_TYPE_KEY,                      "EAPOL key" },
-    { EAP_FRAME_TYPE_ENCAP_ASF_ALERT,  "Encapsulated ASF alert" },
+    { EAP_FRAME_TYPE_PACKET,           "EAP packet" },
+    { EAP_FRAME_TYPE_START,            "EAPOL start" },
+    { EAP_FRAME_TYPE_LOGOFF,           "EAPOL logoff" },
+    { EAP_FRAME_TYPE_KEY,              "EAPOL key" },
+    { EAP_FRAME_TYPE_ENCAP_ASF_ALERT,  "Encapsulated ASF alert" },

     { 0, NULL}
 };
 
 /* RFC 3748 */
 struct eap_packet_t {
     { 0, NULL}
 };
 
 /* RFC 3748 */
 struct eap_packet_t {

-    unsigned char      code;
-    unsigned char      id;
-    unsigned char      length[2];
+    nd_uint8_t  code;
+    nd_uint8_t  id;
+    nd_uint16_t length;

 };
 
 #define                EAP_REQUEST     1
 };
 
 #define                EAP_REQUEST     1


@@ -83,9 +77,9 @@ static const struct tok eap_code_values[] = {
 #define                EAP_TYPE_MD5_CHALLENGE  4
 #define                EAP_TYPE_OTP            5
 #define                EAP_TYPE_GTC            6
 #define                EAP_TYPE_MD5_CHALLENGE  4
 #define                EAP_TYPE_OTP            5
 #define                EAP_TYPE_GTC            6

-#define                EAP_TYPE_TLS            13              /* RFC 2716 */
+#define                EAP_TYPE_TLS            13              /* RFC 5216 */

 #define                EAP_TYPE_SIM            18              /* RFC 4186 */
 #define                EAP_TYPE_SIM            18              /* RFC 4186 */

-#define                EAP_TYPE_TTLS           21              /* draft-funk-eap-ttls-v0-01.txt */
+#define                EAP_TYPE_TTLS           21              /* RFC 5281, draft-funk-eap-ttls-v0-01.txt */

 #define                EAP_TYPE_AKA            23              /* RFC 4187 */
 #define                EAP_TYPE_FAST           43              /* RFC 4851 */
 #define                EAP_TYPE_EXPANDED_TYPES 254
 #define                EAP_TYPE_AKA            23              /* RFC 4187 */
 #define                EAP_TYPE_FAST           43              /* RFC 4851 */
 #define                EAP_TYPE_EXPANDED_TYPES 254


@@ -95,23 +89,23 @@ static const struct tok eap_type_values[] = {
     { EAP_TYPE_NO_PROPOSED,    "No proposed" },
     { EAP_TYPE_IDENTITY,       "Identity" },
     { EAP_TYPE_NOTIFICATION,    "Notification" },
     { EAP_TYPE_NO_PROPOSED,    "No proposed" },
     { EAP_TYPE_IDENTITY,       "Identity" },
     { EAP_TYPE_NOTIFICATION,    "Notification" },

-    { EAP_TYPE_NAK,            "Nak" },
+    { EAP_TYPE_NAK,            "Nak" },

     { EAP_TYPE_MD5_CHALLENGE,   "MD5-challenge" },
     { EAP_TYPE_MD5_CHALLENGE,   "MD5-challenge" },

-    { EAP_TYPE_OTP,            "OTP" },
-    { EAP_TYPE_GTC,            "GTC" },
-    { EAP_TYPE_TLS,            "TLS" },
-    { EAP_TYPE_SIM,            "SIM" },
-    { EAP_TYPE_TTLS,           "TTLS" },
-    { EAP_TYPE_AKA,            "AKA" },
-    { EAP_TYPE_FAST,           "FAST" },
+    { EAP_TYPE_OTP,            "OTP" },
+    { EAP_TYPE_GTC,            "GTC" },
+    { EAP_TYPE_TLS,            "TLS" },
+    { EAP_TYPE_SIM,            "SIM" },
+    { EAP_TYPE_TTLS,           "TTLS" },
+    { EAP_TYPE_AKA,            "AKA" },
+    { EAP_TYPE_FAST,           "FAST" },

     { EAP_TYPE_EXPANDED_TYPES,  "Expanded types" },
     { EAP_TYPE_EXPERIMENTAL,    "Experimental" },
     { 0, NULL}
 };
 
     { EAP_TYPE_EXPANDED_TYPES,  "Expanded types" },
     { EAP_TYPE_EXPERIMENTAL,    "Experimental" },
     { 0, NULL}
 };
 

-#define EAP_TLS_EXTRACT_BIT_L(x)       (((x)&0x80)>>7)
+#define EAP_TLS_EXTRACT_BIT_L(x)       (((x)&0x80)>>7)

 
 

-/* RFC 2716 - EAP TLS bits */
+/* RFC 5216 - EAP TLS bits */

 #define EAP_TLS_FLAGS_LEN_INCLUDED             (1 << 7)
 #define EAP_TLS_FLAGS_MORE_FRAGMENTS           (1 << 6)
 #define EAP_TLS_FLAGS_START                    (1 << 5)
 #define EAP_TLS_FLAGS_LEN_INCLUDED             (1 << 7)
 #define EAP_TLS_FLAGS_MORE_FRAGMENTS           (1 << 6)
 #define EAP_TLS_FLAGS_START                    (1 << 5)


@@ -153,111 +147,127 @@ static const struct tok eap_aka_subtype_values[] = {
  * Print EAP requests / responses
  */
 void
  * Print EAP requests / responses
  */
 void

-eap_print(netdissect_options *ndo _U_,
-          register const u_char *cp,
-          u_int length _U_)
+eap_print(netdissect_options *ndo,
+          const u_char *cp,
+          u_int length)

 {
 {

-    const struct eap_frame_t *eap;
-    const u_char *tptr;
-    u_int tlen, type, subtype;
-    int count=0, len;
-
-    tptr = cp;
-    tlen = length;
-    eap = (const struct eap_frame_t *)cp;
-    TCHECK(*eap);
-
-    /* in non-verbose mode just lets print the basic info */
-    if (vflag < 1) {
-       printf("%s (%u) v%u, len %u",
-               tok2str(eap_frame_type_values, "unknown", eap->type),
-               eap->type,
-               eap->version,
-               EXTRACT_16BITS(eap->length));
-       return;
+    u_int type, subtype, len;
+    u_int count;
+    const char *sep;
+
+    ndo->ndo_protocol = "eap";
+    type = GET_U_1(cp);
+    len = GET_BE_U_2(cp + 2);
+    if (len != length) {
+        /*
+         * Probably a fragment; in some cases the fragmentation might
+         * not put an EAP header on every packet, if reassembly can
+         * be done without that (e.g., fragmentation to make a message
+         * fit in multiple TLVs in a RADIUS packet).
+         */
+        ND_PRINT("EAP fragment?");
+        return;
+    }
+    ND_PRINT("%s (%u), id %u, len %u",
+            tok2str(eap_code_values, "unknown", type),
+            type,
+            GET_U_1((cp + 1)),
+            len);
+    if (len < 4) {
+        ND_PRINT(" (too short for EAP header)");
+        return;

     }
 
     }
 

-    printf("%s (%u) v%u, len %u",
-           tok2str(eap_frame_type_values, "unknown", eap->type),
-           eap->type,
-           eap->version,
-           EXTRACT_16BITS(eap->length));
-
-    tptr += sizeof(const struct eap_frame_t);
-    tlen -= sizeof(const struct eap_frame_t);
-
-    switch (eap->type) {
-    case EAP_FRAME_TYPE_PACKET:
-        type = *(tptr);
-        len = EXTRACT_16BITS(tptr+2);
-        printf(", %s (%u), id %u, len %u",
-               tok2str(eap_code_values, "unknown", type),
-               type,
-               *(tptr+1),
-               len);
-
-        if (!TTEST2(*tptr, len))
-            goto trunc;
+    ND_TCHECK_LEN(cp, len);

 
 

-        if (type <= 2) { /* For EAP_REQUEST and EAP_RESPONSE only */
-            subtype = *(tptr+4);
-            printf("\n\t\t Type %s (%u)",
-                   tok2str(eap_type_values, "unknown", *(tptr+4)),
-                   *(tptr+4));
+    if (type == EAP_REQUEST || type == EAP_RESPONSE) {
+        /* RFC 3748 Section 4.1 */
+        if (len < 5) {
+            ND_PRINT(" (too short for EAP request/response)");
+            return;
+        }
+        subtype = GET_U_1(cp + 4);
+        ND_PRINT("\n\t\t Type %s (%u)",
+                tok2str(eap_type_values, "unknown", subtype),
+                subtype);

 
 

-            switch (subtype) {
+        switch (subtype) {

             case EAP_TYPE_IDENTITY:
             case EAP_TYPE_IDENTITY:

-                if (len - 5 > 0) {
-                    printf(", Identity: ");
-                    safeputs(gndo, tptr + 5, len - 5);
+                /* According to RFC 3748, the message is optional */
+                if (len > 5) {
+                    ND_PRINT(", Identity: ");
+                    nd_printjnp(ndo, cp + 5, len - 5);

                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:
                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:

-                if (len - 5 > 0) {
-                    printf(", Notification: ");
-                    safeputs(gndo, tptr + 5, len - 5);
+                /* According to RFC 3748, there must be at least one octet of message */
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP Notification request/response)");
+                    return;

                 }
                 }

+                ND_PRINT(", Notification: ");
+                nd_printjnp(ndo, cp + 5, len - 5);

                 break;
 
             case EAP_TYPE_NAK:
                 break;
 
             case EAP_TYPE_NAK:

-                count = 5;
-

                 /*
                  * one or more octets indicating
                  * the desired authentication
                  * type one octet per type
                  */
                 /*
                  * one or more octets indicating
                  * the desired authentication
                  * type one octet per type
                  */

-                while (count < len) {
-                    printf(" %s (%u),",
-                           tok2str(eap_type_values, "unknown", *(tptr+count)),
-                           *(tptr+count));
-                    count++;
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP Legacy NAK request/response)");
+                    return;
+                }
+                sep = "";
+                for (count = 5; count < len; count++) {
+                    ND_PRINT("%s %s (%u)", sep,
+                           tok2str(eap_type_values, "unknown", GET_U_1((cp + count))),
+                           GET_U_1(cp + count));
+                    sep = ",";

                 }
                 break;
 
             case EAP_TYPE_TTLS:
                 }
                 break;
 
             case EAP_TYPE_TTLS:

-                printf(" TTLSv%u",
-                       EAP_TTLS_VERSION(*(tptr+5))); /* fall through */

             case EAP_TYPE_TLS:
             case EAP_TYPE_TLS:

-                printf(" flags [%s] 0x%02x,",
-                       bittok2str(eap_tls_flags_values, "none", *(tptr+5)),
-                       *(tptr+5));
-
-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
-                   printf(" len %u", EXTRACT_32BITS(tptr+6));
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP TLS/TTLS request/response)");
+                    return;
+                }
+                if (subtype == EAP_TYPE_TTLS)
+                    ND_PRINT(" TTLSv%u",
+                           EAP_TTLS_VERSION(GET_U_1((cp + 5))));
+                ND_PRINT(" flags [%s] 0x%02x",
+                       bittok2str(eap_tls_flags_values, "none", GET_U_1((cp + 5))),
+                       GET_U_1(cp + 5));
+
+                if (EAP_TLS_EXTRACT_BIT_L(GET_U_1(cp + 5))) {
+                    if (len < 10) {
+                        ND_PRINT(" (too short for EAP TLS/TTLS request/response with length)");
+                        return;
+                    }
+                    ND_PRINT(", len %u", GET_BE_U_4(cp + 6));

                 }
                 break;
 
             case EAP_TYPE_FAST:
                 }
                 break;
 
             case EAP_TYPE_FAST:

-                printf(" FASTv%u",
-                       EAP_TTLS_VERSION(*(tptr+5)));
-                printf(" flags [%s] 0x%02x,",
-                       bittok2str(eap_tls_flags_values, "none", *(tptr+5)),
-                       *(tptr+5));
-
-                if (EAP_TLS_EXTRACT_BIT_L(*(tptr+5))) {
-                    printf(" len %u", EXTRACT_32BITS(tptr+6));
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP FAST request/response)");
+                    return;
+                }
+                ND_PRINT(" FASTv%u",
+                       EAP_TTLS_VERSION(GET_U_1((cp + 5))));
+                ND_PRINT(" flags [%s] 0x%02x",
+                       bittok2str(eap_tls_flags_values, "none", GET_U_1((cp + 5))),
+                       GET_U_1(cp + 5));
+
+                if (EAP_TLS_EXTRACT_BIT_L(GET_U_1(cp + 5))) {
+                    if (len < 10) {
+                        ND_PRINT(" (too short for EAP FAST request/response with length)");
+                        return;
+                    }
+                    ND_PRINT(", len %u", GET_BE_U_4(cp + 6));

                 }
 
                 /* FIXME - TLV attributes follow */
                 }
 
                 /* FIXME - TLV attributes follow */


@@ -265,9 +275,13 @@ eap_print(netdissect_options *ndo _U_,
 
             case EAP_TYPE_AKA:
             case EAP_TYPE_SIM:
 
             case EAP_TYPE_AKA:
             case EAP_TYPE_SIM:

-                printf(" subtype [%s] 0x%02x,",
-                       tok2str(eap_aka_subtype_values, "unknown", *(tptr+5)),
-                       *(tptr+5));
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP SIM/AKA request/response)");
+                    return;
+                }
+                ND_PRINT(" subtype [%s] 0x%02x",
+                       tok2str(eap_aka_subtype_values, "unknown", GET_U_1((cp + 5))),
+                       GET_U_1(cp + 5));

 
                 /* FIXME - TLV attributes follow */
                 break;
 
                 /* FIXME - TLV attributes follow */
                 break;


@@ -279,10 +293,43 @@ eap_print(netdissect_options *ndo _U_,
             case EAP_TYPE_EXPERIMENTAL:
             default:
                 break;
             case EAP_TYPE_EXPERIMENTAL:
             default:
                 break;

-            }

         }
         }

-        break;
+    }
+    return;
+trunc:
+    nd_print_trunc(ndo);
+}
+
+void
+eapol_print(netdissect_options *ndo,
+            const u_char *cp)
+{
+    const struct eap_frame_t *eap;
+    u_int eap_type, eap_len;

 
 

+    ndo->ndo_protocol = "eap";
+    eap = (const struct eap_frame_t *)cp;
+    ND_TCHECK_SIZE(eap);
+    eap_type = GET_U_1(eap->type);
+
+    ND_PRINT("%s (%u) v%u, len %u",
+           tok2str(eap_frame_type_values, "unknown", eap_type),
+           eap_type,
+           GET_U_1(eap->version),
+           GET_BE_U_2(eap->length));
+    if (ndo->ndo_vflag < 1)
+        return;
+
+    cp += sizeof(struct eap_frame_t);
+    eap_len = GET_BE_U_2(eap->length);
+
+    switch (eap_type) {
+    case EAP_FRAME_TYPE_PACKET:
+        if (eap_len == 0)
+            goto trunc;
+        ND_PRINT(", ");
+        eap_print(ndo, cp, eap_len);
+        return;

     case EAP_FRAME_TYPE_LOGOFF:
     case EAP_FRAME_TYPE_ENCAP_ASF_ALERT:
     default:
     case EAP_FRAME_TYPE_LOGOFF:
     case EAP_FRAME_TYPE_ENCAP_ASF_ALERT:
     default:


@@ -291,11 +338,5 @@ eap_print(netdissect_options *ndo _U_,
     return;
 
  trunc:
     return;
 
  trunc:

-    printf("\n\t[|EAP]");
+    nd_print_trunc(ndo);

 }
 }

-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- */