From Marc Poulhies: fix the handling of the authentication option when

the authentication information is missing (which it can be), and fix a
typo.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@12637 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index 5ded3a07ee2d3d50f4d04a85ce8f8bedcb2465e2..13e4d5c5978f80f6c50ccfcd07543d6365b607de 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -2321,6 +2321,7 @@ Ignacio Goyret            <igoyret [AT] lucent.com>
 Bart Braem             <bart.braem [AT] gmail.com>
 Shingo Horisawa                <name4n5 [AT] hotmail.com>
 Lane Hu                        <lane.hu [AT] utstar.com>
+Marc Poulhiès         <marc.poulhies [AT] epfl.ch>
 
 Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.

diff --git a/epan/dissectors/packet-dhcpv6.c b/epan/dissectors/packet-dhcpv6.c
index d4c9db109068e1e21972b9fee17f962c03748f57..208530ec24db5cb4924b24faae54a7610a45dbff 100644 (file)
--- a/epan/dissectors/packet-dhcpv6.c
+++ b/epan/dissectors/packet-dhcpv6.c
@@ -423,7 +423,7 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff,
           } 
          break;
        case OPTION_AUTH:
-         if (optlen < 15) {
+         if (optlen < 11) {
            proto_tree_add_text(subtree, tvb, off,
                                optlen, "AUTH: malformed option");
            break;
@@ -438,9 +438,10 @@ dhcpv6_option(tvbuff_t *tvb, proto_tree *bp_tree, int off, int eoff,
                              "RDM: %d",
                              (guint32)tvb_get_guint8(tvb, off+2));
          proto_tree_add_text(subtree, tvb, off+3, 8,
-                             "Reply Detection");
-         proto_tree_add_text(subtree, tvb, off+11, optlen-11,
-                             "Authentication Information");
+                             "Replay Detection");
+         if (optlen != 11)
+               proto_tree_add_text(subtree, tvb, off+11, optlen-11,
+                                                       "Authentication Information");
          break;
        case OPTION_UNICAST:
          if (optlen != 16) {