← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/wireshark/gutsy-security

« back to all changes in this revision

Viewing changes to epan/dissectors/packet-eapol.c

  • Committer: Bazaar Package Importer
  • Author(s): Frederic Peters
  • Date: 2007-04-01 08:58:40 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070401085840-or3qhrpv8alt1bwg
Tags: 0.99.5-1
* New upstream release.
* debian/patches/09_idl2wrs.dpatch: updated to patch idl2wrs.sh.in.

Show diffs side-by-side

added added

removed removed

Lines of Context:
epan/dissectors/packet-eapol.c
3
3
 * (From IEEE Draft P802.1X/D11; is there a later draft, or a
4
4
 * final standard?  If so, check it.)
5
5
 *
6
 
 * $Id: packet-eapol.c 18770 2006-07-20 09:21:32Z sahlberg $
 
6
 * $Id: packet-eapol.c 20625 2007-01-30 17:44:11Z gerald $
7
7
 *
8
8
 * Wireshark - Network traffic analyzer
9
9
 * By Gerald Combs <gerald@wireshark.org>
30
30
 
31
31
#include <glib.h>
32
32
#include <epan/packet.h>
 
33
#include <epan/crypt/wep-wpadefs.h>
33
34
#include "packet-ieee80211.h"
34
35
#include <epan/etypes.h>
35
36
 
185
186
      offset += 1;
186
187
      if (keydesc_type == EAPOL_WPA_KEY || keydesc_type == EAPOL_RSN_KEY) {
187
188
        keyinfo = tvb_get_ntohs(tvb, offset);
188
 
        keyinfo_item = 
 
189
        keyinfo_item =
189
190
          proto_tree_add_uint(eapol_tree, hf_eapol_wpa_keydes_keyinfo, tvb,
190
191
                              offset, 2, keyinfo);
191
192
 
329
330
                BASE_HEX, NULL, 0x0, "WPA key info", HFILL }},
330
331
 
331
332
        { &hf_eapol_wpa_keydes_keyinfo_keydes_ver, {
332
 
                "Key Descriptor Version", 
333
 
                "eapol.keydes.key_info.keydes_ver", 
 
333
                "Key Descriptor Version",
 
334
                "eapol.keydes.key_info.keydes_ver",
334
335
                FT_UINT16, BASE_DEC, VALS(&keydes_ver),
335
 
                KEY_INFO_KEYDES_VER_MASK, 
 
336
                KEY_INFO_KEYDES_VER_MASK,
336
337
                "Key Descriptor Version Type", HFILL }},
337
338
        { &hf_eapol_wpa_keydes_keyinfo_key_type, {
338
 
                "Key Type", 
339
 
                "eapol.keydes.key_info.key_type", 
340
 
                FT_BOOLEAN, 16, TFS(&tfs_keyinfo_key_type), 
341
 
                KEY_INFO_KEY_TYPE_MASK, 
 
339
                "Key Type",
 
340
                "eapol.keydes.key_info.key_type",
 
341
                FT_BOOLEAN, 16, TFS(&tfs_keyinfo_key_type),
 
342
                KEY_INFO_KEY_TYPE_MASK,
342
343
                "Key Type (Pairwise or Group)", HFILL }},
343
344
        { &hf_eapol_wpa_keydes_keyinfo_key_index, {
344
 
                "Key Index", 
345
 
                "eapol.keydes.key_info.key_index", 
346
 
                FT_UINT16, BASE_DEC, NULL, 
347
 
                KEY_INFO_KEY_INDEX_MASK, 
 
345
                "Key Index",
 
346
                "eapol.keydes.key_info.key_index",
 
347
                FT_UINT16, BASE_DEC, NULL,
 
348
                KEY_INFO_KEY_INDEX_MASK,
348
349
                "Key Index (0-3) (RSN: Reserved)", HFILL }},
349
350
        { &hf_eapol_wpa_keydes_keyinfo_install, {
350
 
                "Install flag", 
351
 
                "eapol.keydes.key_info.install", 
352
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
353
 
                KEY_INFO_INSTALL_MASK, 
 
351
                "Install flag",
 
352
                "eapol.keydes.key_info.install",
 
353
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
354
                KEY_INFO_INSTALL_MASK,
354
355
                "Install flag", HFILL }},
355
356
        { &hf_eapol_wpa_keydes_keyinfo_key_ack, {
356
 
                "Key Ack flag", 
357
 
                "eapol.keydes.key_info.key_ack", 
358
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
359
 
                KEY_INFO_KEY_ACK_MASK, 
 
357
                "Key Ack flag",
 
358
                "eapol.keydes.key_info.key_ack",
 
359
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
360
                KEY_INFO_KEY_ACK_MASK,
360
361
                "Key Ack flag", HFILL }},
361
362
        { &hf_eapol_wpa_keydes_keyinfo_key_mic, {
362
 
                "Key MIC flag", 
363
 
                "eapol.keydes.key_info.key_mic", 
364
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
365
 
                KEY_INFO_KEY_MIC_MASK, 
 
363
                "Key MIC flag",
 
364
                "eapol.keydes.key_info.key_mic",
 
365
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
366
                KEY_INFO_KEY_MIC_MASK,
366
367
                "Key MIC flag", HFILL }},
367
368
        { &hf_eapol_wpa_keydes_keyinfo_secure, {
368
 
                "Secure flag", 
369
 
                "eapol.keydes.key_info.secure", 
370
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
371
 
                KEY_INFO_SECURE_MASK, 
 
369
                "Secure flag",
 
370
                "eapol.keydes.key_info.secure",
 
371
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
372
                KEY_INFO_SECURE_MASK,
372
373
                "Secure flag", HFILL }},
373
374
        { &hf_eapol_wpa_keydes_keyinfo_error, {
374
 
                "Error flag", 
375
 
                "eapol.keydes.key_info.error", 
376
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
377
 
                KEY_INFO_ERROR_MASK, 
 
375
                "Error flag",
 
376
                "eapol.keydes.key_info.error",
 
377
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
378
                KEY_INFO_ERROR_MASK,
378
379
                "Error flag", HFILL }},
379
380
        { &hf_eapol_wpa_keydes_keyinfo_request, {
380
 
                "Request flag", 
381
 
                "eapol.keydes.key_info.request", 
382
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
383
 
                KEY_INFO_REQUEST_MASK, 
 
381
                "Request flag",
 
382
                "eapol.keydes.key_info.request",
 
383
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
384
                KEY_INFO_REQUEST_MASK,
384
385
                "Request flag", HFILL }},
385
386
        { &hf_eapol_wpa_keydes_keyinfo_encr_key_data, {
386
 
                "Encrypted Key Data flag", 
387
 
                "eapol.keydes.key_info.encr_key_data", 
388
 
                FT_BOOLEAN, 16, TFS(&flags_set_truth), 
389
 
                KEY_INFO_ENCR_KEY_DATA_MASK, 
 
387
                "Encrypted Key Data flag",
 
388
                "eapol.keydes.key_info.encr_key_data",
 
389
                FT_BOOLEAN, 16, TFS(&flags_set_truth),
 
390
                KEY_INFO_ENCR_KEY_DATA_MASK,
390
391
                "Encrypted Key Data flag", HFILL }},
391
392
        { &hf_eapol_wpa_keydes_nonce, {
392
393
                "Nonce", "eapol.keydes.nonce", FT_BYTES, BASE_NONE,