From 6fa02a7db4b4055b1f72d144746a3cc52f737ed7 Mon Sep 17 00:00:00 2001 From: Keith Jones Date: Fri, 5 Mar 2021 10:53:46 -0500 Subject: [PATCH] Replace assert with if statement so OpenVPN can use this over UDP. And fix spelling. --- src/analyzer/protocol/ssl/SSL.cc | 3 +-- src/analyzer/protocol/ssl/SSL.h | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/analyzer/protocol/ssl/SSL.cc b/src/analyzer/protocol/ssl/SSL.cc index aeaa63a7a0..eec176dbbd 100644 --- a/src/analyzer/protocol/ssl/SSL.cc +++ b/src/analyzer/protocol/ssl/SSL.cc @@ -57,8 +57,7 @@ void SSL_Analyzer::DeliverStream(int len, const u_char* data, bool orig) { analyzer::tcp::TCP_ApplicationAnalyzer::DeliverStream(len, data, orig); - assert(TCP()); - if ( TCP()->IsPartial() ) + if ( TCP() && TCP()->IsPartial() ) return; if ( had_gap ) diff --git a/src/analyzer/protocol/ssl/SSL.h b/src/analyzer/protocol/ssl/SSL.h index bb1ee98941..12dd2ce57c 100644 --- a/src/analyzer/protocol/ssl/SSL.h +++ b/src/analyzer/protocol/ssl/SSL.h @@ -15,7 +15,7 @@ public: explicit SSL_Analyzer(Connection* conn); ~SSL_Analyzer() override; - // Overriden from Analyzer. + // Overridden from Analyzer. void Done() override; void DeliverStream(int len, const u_char* data, bool orig) override; void Undelivered(uint64_t seq, int len, bool orig) override; @@ -27,7 +27,7 @@ public: // Get the TLS version that the server chose. 0 if not yet known. uint16_t GetNegotiatedVersion() const; - // Overriden from analyzer::tcp::TCP_ApplicationAnalyzer. + // Overridden from analyzer::tcp::TCP_ApplicationAnalyzer. void EndpointEOF(bool is_orig) override; static analyzer::Analyzer* Instantiate(Connection* conn)