From: Masud Hasan (mashasan) <mashasan@cisco.com>
Date: Wed, 25 Nov 2020 21:11:23 +0000 (+0000)
Subject: Merge pull request #2643 in SNORT/snort3 from ~SATHIRKA/snort3:dhcp_fp_decrypt_store... 
X-Git-Tag: 3.0.3-6~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9898d336b484fdeb17549a59f9e4ea2e16706df2;p=thirdparty%2Fsnort3.git

Merge pull request #2643 in SNORT/snort3 from ~SATHIRKA/snort3:dhcp_fp_decrypt_store to master

Squashed commit of the following:

commit eb8a898bfbd86b6e7daf74acac95f5d604e8e2a9
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Nov 24 15:32:47 2020 -0500

    rna: Remove unused function
---

diff --git a/src/network_inspectors/rna/rna_fingerprint_udp.h b/src/network_inspectors/rna/rna_fingerprint_udp.h
index 6d4a3f2eb..f2456f415 100644
--- a/src/network_inspectors/rna/rna_fingerprint_udp.h
+++ b/src/network_inspectors/rna/rna_fingerprint_udp.h
@@ -35,13 +35,6 @@ public:
     DHCPFingerprint(const RawFingerprint& rfp);
     std::vector<FpElement> dhcp55;
     std::string dhcp60;
-
-    void clear() override
-    {
-        FpFingerprint::clear();
-        dhcp55.clear();
-        dhcp60.clear();
-    }
 };
 
 struct FpDHCPKey