Use ENC_NA as encoding for proto_tree_add_item() calls which directly reference an hf item (in hf[] with types:

   FT_NONE
   FT_BYTES
   FT_IPV6
   FT_IPXNET
   FT_OID

Note: Encoding field set to ENC_NA only if the field was previously TRUE|FALSE|ENC_LITTLE_ENDIAN|ENC_BIG_ENDIAN

svn path=/trunk/; revision=39260

1 files changed, 9 insertions, 9 deletions

diff --git a/epan/dissectors/packet-eapol.c b/epan/dissectors/packet-eapol.c
index 2f7f3f2dce..6a1ab76b73 100644
--- a/epan/dissectors/packet-eapol.c
+++ b/epan/dissectors/packet-eapol.c
@@ -242,19 +242,19 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         		    offset, 8, FALSE);
         offset += 8;
         proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_nonce, tvb, offset,
-        		    32, FALSE);
+        		    32, ENC_NA);
         offset += 32;
         proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb,
-        		    offset, 16, FALSE);
+        		    offset, 16, ENC_NA);
         offset += 16;
         proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_rsc, tvb, offset,
-        		    8, FALSE);
+        		    8, ENC_NA);
         offset += 8;
         proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_id, tvb, offset, 8,
-        		    FALSE);
+        		    ENC_NA);
         offset += 8;
         proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_mic, tvb, offset,
-        		    16, FALSE);
+        		    16, ENC_NA);
         offset += 16;
         eapol_data_len = tvb_get_ntohs(tvb, offset);
         proto_tree_add_uint(eapol_tree, hf_eapol_wpa_keydes_datalen, tvb,
@@ -262,7 +262,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         offset += 2;
         if (eapol_data_len != 0) {
           ti = proto_tree_add_item(eapol_tree, hf_eapol_wpa_keydes_data,
-          	tvb, offset, eapol_data_len, FALSE);
+          	tvb, offset, eapol_data_len, ENC_NA);
 	  if ((keyinfo & KEY_INFO_ENCR_KEY_DATA_MASK) ||
 	      !(keyinfo & KEY_INFO_KEY_TYPE_MASK)) {
 	    /* RSN: EAPOL-Key Key Data is encrypted.
@@ -284,7 +284,7 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   			  offset, 8, FALSE);
         offset += 8;
         proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_iv, tvb,
-  			  offset, 16, FALSE);
+  			  offset, 16, ENC_NA);
         offset += 16;
         key_index = tvb_get_guint8(tvb, offset);
         ti = proto_tree_add_text(eapol_tree, tvb, offset, 1,
@@ -298,12 +298,12 @@ dissect_eapol(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   			     tvb, offset, 1, key_index);
         offset += 1;
         proto_tree_add_item(eapol_tree, hf_eapol_keydes_key_signature, tvb,
-  			  offset, 16, FALSE);
+  			  offset, 16, ENC_NA);
         offset += 16;
         if (eapol_key_len != 0) {
           if (eapol_len > 44) { /* Size of rc4 key with no key content */
             proto_tree_add_item(eapol_tree, hf_eapol_keydes_key, tvb, offset,
-  			    eapol_key_len, FALSE);
+  			    eapol_key_len, ENC_NA);
           } else {
 		/* IEEE 802.1X-2004 7.6.3.6: If no bytes remain, then  */
 		proto_tree_add_text(eapol_tree, tvb, offset, 0, "Key: Use key locally generated by peer");