From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 29 Apr 2021 18:00:22 +0000 (+0000)
Subject: Merge pull request #2866 in SNORT/snort3 from ~BRASTULT/snort3:base64_relative to... 
X-Git-Tag: 3.1.5.0~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bddfa39cc733af07e883a6a5b3fec65610c4d310;p=thirdparty%2Fsnort3.git

Merge pull request #2866 in SNORT/snort3 from ~BRASTULT/snort3:base64_relative to master

Squashed commit of the following:

commit e485d60864b6a756b84d548a619445377ed1b916
Author: Brandon Stultz <brastult@cisco.com>
Date:   Tue Apr 27 15:55:28 2021 -0400

    ips_options: fix relative base64_decode
---

diff --git a/src/ips_options/ips_base64.cc b/src/ips_options/ips_base64.cc
index b73b59ef7..7084bd4b5 100644
--- a/src/ips_options/ips_base64.cc
+++ b/src/ips_options/ips_base64.cc
@@ -66,6 +66,9 @@ public:
     uint32_t hash() const override;
     bool operator==(const IpsOption&) const override;
 
+    bool is_relative() override
+    { return config.flags & BASE64DECODE_RELATIVE_FLAG; }
+
     EvalStatus eval(Cursor&, Packet*) override;
 
 private: