]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-eap.c
projects / tcpdump / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
icmp: clean up the extension code and comments.
[tcpdump] / print-eap.c
diff --git a/print-eap.c b/print-eap.c
index de59374b03cc351f0157c02b062a614513529602..e154165a455f88860f01f3843888c54c6983ae6d 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -21,7 +21,7 @@
 /* \summary: Extensible Authentication Protocol (EAP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Extensible Authentication Protocol (EAP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "netdissect-stdinc.h"
 #endif
 
 #include "netdissect-stdinc.h"
@@ -77,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
@@ -105,7 +105,7 @@ static const struct tok eap_type_values[] = {
 
 #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)
@@ -151,116 +151,122 @@ eap_print(netdissect_options *ndo,
           const u_char *cp,
           u_int length)
 {
           const u_char *cp,
           u_int length)
 {
-    const struct eap_frame_t *eap;
-    const u_char *tptr;
-    u_int eap_type, tlen, type, subtype;
-    int count=0, len;
-
-    tptr = cp;
-    tlen = length;
-    eap = (const struct eap_frame_t *)cp;
-    ND_TCHECK_SIZE(eap);
-    eap_type = EXTRACT_U_1(eap->type);
-
-    /* in non-verbose mode just lets print the basic info */
-    if (ndo->ndo_vflag < 1) {
-       ND_PRINT("%s (%u) v%u, len %u",
-               tok2str(eap_frame_type_values, "unknown", eap_type),
-               eap_type,
-               EXTRACT_U_1(eap->version),
-               EXTRACT_BE_U_2(eap->length));
-       return;
+    u_int type, subtype, len;
+    u_int count;
+    const char *sep;
+
+    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;
     }
 
     }
 
-    ND_PRINT("%s (%u) v%u, len %u",
-           tok2str(eap_frame_type_values, "unknown", eap_type),
-           eap_type,
-           EXTRACT_U_1(eap->version),
-           EXTRACT_BE_U_2(eap->length));
+    ND_TCHECK_LEN(cp, len);
 
 
-    tptr += sizeof(struct eap_frame_t);
-    tlen -= sizeof(struct eap_frame_t);
+    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 (eap_type) {
-    case EAP_FRAME_TYPE_PACKET:
-        ND_TCHECK_1(tptr);
-        type = EXTRACT_U_1(tptr);
-        ND_TCHECK_2(tptr + 2);
-        len = EXTRACT_BE_U_2(tptr + 2);
-        ND_PRINT(", %s (%u), id %u, len %u",
-               tok2str(eap_code_values, "unknown", type),
-               type,
-               EXTRACT_U_1((tptr + 1)),
-               len);
-
-        ND_TCHECK_LEN(tptr, len);
-
-        if (type <= 2) { /* For EAP_REQUEST and EAP_RESPONSE only */
-            ND_TCHECK_1(tptr + 4);
-            subtype = EXTRACT_U_1(tptr + 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) {
+                /* According to RFC 3748, the message is optional */
+                if (len > 5) {
                     ND_PRINT(", Identity: ");
                     ND_PRINT(", Identity: ");
-                    safeputs(ndo, tptr + 5, len - 5);
+                    nd_printjnp(ndo, cp + 5, len - 5);
                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:
                 }
                 break;
 
             case EAP_TYPE_NOTIFICATION:
-                if (len - 5 > 0) {
-                    ND_PRINT(", Notification: ");
-                    safeputs(ndo, 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) {
-                    ND_TCHECK_1(tptr + count);
-                    ND_PRINT(" %s (%u),",
-                           tok2str(eap_type_values, "unknown", EXTRACT_U_1((tptr + count))),
-                           EXTRACT_U_1(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:
             case EAP_TYPE_TLS:
                 }
                 break;
 
             case EAP_TYPE_TTLS:
             case EAP_TYPE_TLS:
-                ND_TCHECK_1(tptr + 5);
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP TLS/TTLS request/response)");
+                    return;
+                }
                 if (subtype == EAP_TYPE_TTLS)
                     ND_PRINT(" TTLSv%u",
                 if (subtype == EAP_TYPE_TTLS)
                     ND_PRINT(" TTLSv%u",
-                           EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5))));
-                ND_PRINT(" flags [%s] 0x%02x,",
-                       bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
-                       EXTRACT_U_1(tptr + 5));
-
-                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {
-                    ND_TCHECK_4(tptr + 6);
-                   ND_PRINT(" len %u", EXTRACT_BE_U_4(tptr + 6));
+                           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:
-                ND_TCHECK_1(tptr + 5);
+                if (len < 6) {
+                    ND_PRINT(" (too short for EAP FAST request/response)");
+                    return;
+                }
                 ND_PRINT(" FASTv%u",
                 ND_PRINT(" FASTv%u",
-                       EAP_TTLS_VERSION(EXTRACT_U_1((tptr + 5))));
-                ND_PRINT(" flags [%s] 0x%02x,",
-                       bittok2str(eap_tls_flags_values, "none", EXTRACT_U_1((tptr + 5))),
-                       EXTRACT_U_1(tptr + 5));
-
-                if (EAP_TLS_EXTRACT_BIT_L(EXTRACT_U_1(tptr + 5))) {
-                    ND_TCHECK_4(tptr + 6);
-                    ND_PRINT(" len %u", EXTRACT_BE_U_4(tptr + 6));
+                       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 */
@@ -268,10 +274,13 @@ eap_print(netdissect_options *ndo,
 
             case EAP_TYPE_AKA:
             case EAP_TYPE_SIM:
 
             case EAP_TYPE_AKA:
             case EAP_TYPE_SIM:
-                ND_TCHECK_1(tptr + 5);
-                ND_PRINT(" subtype [%s] 0x%02x,",
-                       tok2str(eap_aka_subtype_values, "unknown", EXTRACT_U_1((tptr + 5))),
-                       EXTRACT_U_1(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;
@@ -283,10 +292,43 @@ eap_print(netdissect_options *ndo,
             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:
@@ -295,11 +337,5 @@ eap_print(netdissect_options *ndo,
     return;
 
  trunc:
     return;
 
  trunc:
-    ND_PRINT("\n\t[|EAP]");
+    nd_print_trunc(ndo);
 }
 }
-
-/*
- * Local Variables:
- * c-basic-offset: 4
- * End:
- */
[mirror] the TCPdump network dissector