Disabling the ssh parser temporarily, since we are moving away from some

of the archaic features we use in the app layer. We will reintroduce this
parser shortly. Also do note that keywords that rely on the ssh parser
would now be disabled.

diff --git a/src/app-layer-parser.c b/src/app-layer-parser.c
index 78f0b6b7b0a17debbb84403128d248f6c1309612..ed8f18db10f8d728074f4bc45d2529e8f79b2f81 100644 (file)
--- a/src/app-layer-parser.c
+++ b/src/app-layer-parser.c
@@ -1453,7 +1453,13 @@ void RegisterAppLayerParsers(void)
     RegisterDCERPCParsers();
     RegisterDCERPCUDPParsers();
     RegisterFTPParsers();
+    /* we are disabling the ssh parser temporarily, since we are moving away
+     * from some of the archaic features we use in the app layer.  We will
+     * reintroduce this parser.  Also do note that keywords that rely on
+     * the ssh parser would now be disabled */
+#if 0
     RegisterSSHParsers();
+#endif
     RegisterSMTPParsers();
     RegisterDNSUDPParsers();
     RegisterDNSTCPParsers();

diff --git a/src/app-layer-ssh.c b/src/app-layer-ssh.c
index c915af5adf23362586eebc3418f44ac27c72bf43..ecd0252cec53463d593c25e05a4f3b988ad494fa 100644 (file)
--- a/src/app-layer-ssh.c
+++ b/src/app-layer-ssh.c
@@ -1,3 +1,9 @@
+/* we are disabling the ssh parser temporarily, since we are moving away
+ * from some of the archaic features we use in the app layer.  We will
+ * reintroduce this parser.  Also do note that keywords that rely on
+ * the ssh parser would now be disabled */
+#if 0
+
 /* Copyright (C) 2007-2010 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
@@ -1853,3 +1859,5 @@ void SSHParserRegisterTests(void) {
     UtRegisterTest("SSHParserTest14 - ToClient 4 chunks", SSHParserTest14, 1);
 #endif /* UNITTESTS */
 }
+
+#endif /* #if 0 */

diff --git a/src/detect-ssh-proto-version.c b/src/detect-ssh-proto-version.c
index e66be0f902af6507a52a9e9d823ada2d0e190bdb..1a7f856b58d5989c06762bb9d50dc4b114446512 100644 (file)
--- a/src/detect-ssh-proto-version.c
+++ b/src/detect-ssh-proto-version.c
@@ -1,3 +1,8 @@
+/* we are disabling the ssh parser temporarily, since we are moving away
+ * from some of the archaic features we use in the app layer.  We will
+ * reintroduce this parser.  Also do note that keywords that rely on
+ * the ssh parser would now be disabled */
+#if 0
 /* Copyright (C) 2007-2010 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
@@ -681,3 +686,4 @@ void DetectSshVersionRegisterTests(void) {
 #endif /* UNITTESTS */
 }
 
+#endif /* #if 0 */

diff --git a/src/detect-ssh-software-version.c b/src/detect-ssh-software-version.c
index bcde214b87197cc03274ce2b232fc32b825c904f..b07b0108fac7b35e3c0d854c6572f77a1ac28526 100644 (file)
--- a/src/detect-ssh-software-version.c
+++ b/src/detect-ssh-software-version.c
@@ -1,3 +1,8 @@
+/* we are disabling the ssh parser temporarily, since we are moving away
+ * from some of the archaic features we use in the app layer.  We will
+ * reintroduce this parser.  Also do note that keywords that rely on
+ * the ssh parser would now be disabled */
+#if 0
 /* Copyright (C) 2007-2010 Open Information Security Foundation
  *
  * You can copy, redistribute or modify this Program under the terms of
@@ -654,3 +659,4 @@ void DetectSshSoftwareVersionRegisterTests(void) {
 #endif /* UNITTESTS */
 }
 
+#endif /* #if 0 */

diff --git a/src/detect.c b/src/detect.c
index 682c8bb4ff387ca47abecdcac91198edd1827e81..e19d85ddb9b8c9e30837d9d86382081c89060001 100644 (file)
--- a/src/detect.c
+++ b/src/detect.c
@@ -4735,9 +4735,15 @@ void SigTableSetup(void) {
     DetectHttpUriRegister();
     DetectHttpRawUriRegister();
     DetectAsn1Register();
+/* we are disabling the ssh parser temporarily, since we are moving away
+ * from some of the archaic features we use in the app layer.  We will
+ * reintroduce this parser.  Also do note that keywords that rely on
+ * the ssh parser would now be disabled */
+#if 0
     DetectSshVersionRegister();
-    DetectSslStateRegister();
     DetectSshSoftwareVersionRegister();
+#endif
+    DetectSslStateRegister();
     DetectHttpStatCodeRegister();
     DetectSslVersionRegister();
     DetectByteExtractRegister();

diff --git a/src/runmode-unittests.c b/src/runmode-unittests.c
index b58abcbd8c3070a62074a11b11b003079f33cae4..60b93d5cce150a9c3e7351964d954bfab2455d68 100644 (file)
--- a/src/runmode-unittests.c
+++ b/src/runmode-unittests.c
@@ -188,7 +188,13 @@ int RunUnittests(int list_unittests, char *regex_arg)
     DecodePPPRegisterTests();
     DecodeVLANRegisterTests();
     HTPParserRegisterTests();
+/* we are disabling the ssh parser temporarily, since we are moving away
+ * from some of the archaic features we use in the app layer.  We will
+ * reintroduce this parser.  Also do note that keywords that rely on
+ * the ssh parser would now be disabled */
+#if 0
     SSHParserRegisterTests();
+#endif
     SMBParserRegisterTests();
     DCERPCParserRegisterTests();
     DCERPCUDPParserRegisterTests();