Merge pull request #585 in SNORT/snort3 from asn1 to master

Squashed commit of the following:

commit dbdda4825dc3478cb5066504ce599f4dfe9eada9
Author: Russ Combs <rucombs@cisco.com>
Date:   Tue Aug 9 13:33:44 2016 -0400

    fix asn1:print help

diff --git a/src/ips_options/ips_asn1.cc b/src/ips_options/ips_asn1.cc
index 5321288a616705db3cf0897c1ea72c4b6222a69a..80bc4c33dd9a3e5838f9c07b04995e735c3e8533 100644 (file)
--- a/src/ips_options/ips_asn1.cc
+++ b/src/ips_options/ips_asn1.cc
@@ -192,7 +192,7 @@ static const Parameter s_params[] =
       "Detects a double ASCII encoding that is larger than a standard buffer." },
 
     { PRINT_OPT, Parameter::PT_IMPLIED, nullptr, nullptr,
-      "<>max | <max | >min" },
+      "dump decode data to console; always true" },
 
     { LENGTH_OPT, Parameter::PT_INT, "0:", nullptr,
       "Compares ASN.1 type lengths with the supplied argument." },