From: russ <rucombs@cisco.com>
Date: Thu, 26 Mar 2015 16:32:49 +0000 (-0400)
Subject: missed ssh updates
X-Git-Tag: 3.0.0-233~1011
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a1187076808d68ecd3d2ae7ecadc53ed4e7786;p=thirdparty%2Fsnort3.git

missed ssh updates
---

diff --git a/src/service_inspectors/ssh/ssh.cc b/src/service_inspectors/ssh/ssh.cc
index e005d99ff..d0b74b4fc 100644
--- a/src/service_inspectors/ssh/ssh.cc
+++ b/src/service_inspectors/ssh/ssh.cc
@@ -780,10 +780,6 @@ static unsigned int ProcessSSHKeyExchange(SSHData* sessionp, Packet* p,
         {
             next_packet = false;
             npacket_offset = 0;
-            {
-                /* Invalid packet length. */
-                SnortEventqAdd(GID_SSH, SSH_EVENT_PAYLOAD_SIZE);
-            }
         }
     }
 
diff --git a/tools/snort2lua/preprocessor_states/pps_ssh.cc b/tools/snort2lua/preprocessor_states/pps_ssh.cc
index f7fead6d9..53c869992 100644
--- a/tools/snort2lua/preprocessor_states/pps_ssh.cc
+++ b/tools/snort2lua/preprocessor_states/pps_ssh.cc
@@ -57,7 +57,7 @@ bool Ssh::convert(std::istringstream& data_stream)
         bool tmpval = true;
 
         if (!keyword.compare("autodetect"))
-            tmpval = table_api.add_option("autodetect", true);
+            table_api.add_deleted_comment("autodetect");
 
         else if (!keyword.compare("enable_respoverflow"))
             table_api.add_deleted_comment("enable_respoverflow");
@@ -82,17 +82,17 @@ bool Ssh::convert(std::istringstream& data_stream)
 
         else if (!keyword.compare("max_client_bytes"))
         {
-            tmpval = parse_int_option("max_client_bytes", data_stream, true);
+            tmpval = parse_int_option("max_client_bytes", data_stream, false);
         }
 
         else if (!keyword.compare("max_encrypted_packets"))
         {
-            tmpval = parse_int_option("max_encrypted_packets", data_stream, true);
+            tmpval = parse_int_option("max_encrypted_packets", data_stream, false);
         }
 
         else if (!keyword.compare("max_server_version_len"))
         {
-            tmpval = parse_int_option("max_server_version_len", data_stream, true);
+            tmpval = parse_int_option("max_server_version_len", data_stream, false);
         }
 
         else if (!keyword.compare("server_ports"))