detect/ssh: remove deprecated keywords

Ticket: 2377
OISF · Jun 20, 2024 · 7dfd7c6 · 7dfd7c6
1 parent 6256391
commit 7dfd7c6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 1,223 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -296,9 +296,7 @@ noinst_HEADERS = \
 	detect-ssh-hassh-server-string.h \
 	detect-ssh-hassh-string.h \
 	detect-ssh-proto.h \
-	detect-ssh-proto-version.h \
 	detect-ssh-software.h \
-	detect-ssh-software-version.h \
 	detect-ssl-state.h \
 	detect-ssl-version.h \
 	detect-stream_size.h \
@@ -895,9 +893,7 @@ libsuricata_c_a_SOURCES = \
 	detect-ssh-hassh-server-string.c \
 	detect-ssh-hassh-string.c \
 	detect-ssh-proto.c \
-	detect-ssh-proto-version.c \
 	detect-ssh-software.c \
-	detect-ssh-software-version.c \
 	detect-ssl-state.c \
 	detect-ssl-version.c \
 	detect-stream_size.c \

diff --git a/src/detect-engine-register.c b/src/detect-engine-register.c
@@ -264,9 +264,7 @@
 #include "detect-tls-cert-validity.h"
 #include "detect-tls-version.h"
 #include "detect-ssh-proto.h"
-#include "detect-ssh-proto-version.h"
 #include "detect-ssh-software.h"
-#include "detect-ssh-software-version.h"
 #include "detect-ssh-hassh.h"
 #include "detect-ssh-hassh-server.h"
 #include "detect-ssh-hassh-string.h"
@@ -647,9 +645,7 @@ void SigTableSetup(void)
     DetectDetectionFilterRegister();
     DetectAsn1Register();
     DetectSshProtocolRegister();
-    DetectSshVersionRegister();
     DetectSshSoftwareRegister();
-    DetectSshSoftwareVersionRegister();
     DetectSshHasshRegister();
     DetectSshHasshServerRegister();
     DetectSshHasshStringRegister();

diff --git a/src/detect-engine-register.h b/src/detect-engine-register.h
@@ -173,9 +173,7 @@ enum DetectKeywordId {
     DETECT_AL_NFS_PROCEDURE,
     DETECT_AL_NFS_VERSION,
     DETECT_AL_SSH_PROTOCOL,
-    DETECT_AL_SSH_PROTOVERSION,
     DETECT_AL_SSH_SOFTWARE,
-    DETECT_AL_SSH_SOFTWAREVERSION,
     DETECT_AL_SSH_HASSH,
     DETECT_AL_SSH_HASSH_SERVER,
     DETECT_AL_SSH_HASSH_STRING,