detect-ssh: cleanup duplicate code

9 years ago · 955c227127
parent 2f30adb08a
commit 955c227127
2 changed files with 4 additions and 14 deletions
--- a/src/detect-ssh-proto.c
+++ b/src/detect-ssh-proto.c
@ -164,13 +164,8 @@ static int InspectEngineSshProtocol(ThreadVars *tv,
        return DETECT_ENGINE_INSPECT_SIG_MATCH;

 end:
-    if (flags & STREAM_TOSERVER) {
    if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
        return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    } else {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    }
    return DETECT_ENGINE_INSPECT_SIG_NO_MATCH;
 }

--- a/src/detect-ssh-software.c
+++ b/src/detect-ssh-software.c
@ -164,13 +164,8 @@ static int InspectEngineSshSoftware(ThreadVars *tv,
        return DETECT_ENGINE_INSPECT_SIG_MATCH;

 end:
-    if (flags & STREAM_TOSERVER) {
    if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
        return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    } else {
-        if (AppLayerParserGetStateProgress(IPPROTO_TCP, ALPROTO_SSH, tx, flags) >= SSH_STATE_BANNER_DONE)
-            return DETECT_ENGINE_INSPECT_SIG_CANT_MATCH;
-    }
    return DETECT_ENGINE_INSPECT_SIG_NO_MATCH;
 }