Merge remote-tracking branch 'origin/master' into topic/johanna/tls12-decryption

This commit is contained in:
Johanna Amann 2021-10-13 10:49:29 +01:00
commit b8b6ac744e
1531 changed files with 109968 additions and 46436 deletions

View file

@ -1,17 +1,30 @@
#pragma once
#include "zeek/analyzer/protocol/pia/PIA.h"
#include "zeek/analyzer/protocol/ssl/events.bif.h"
#include "zeek/analyzer/protocol/tcp/TCP.h"
#include "zeek/analyzer/protocol/ssl/events.bif.h"
namespace binpac
{
namespace SSL
{
class SSL_Conn;
}
}
namespace binpac { namespace SSL { class SSL_Conn; } }
namespace binpac
{
namespace TLSHandshake
{
class Handshake_Conn;
}
}
namespace binpac { namespace TLSHandshake { class Handshake_Conn; } }
namespace zeek::analyzer::ssl
{
namespace zeek::analyzer::ssl {
class SSL_Analyzer final : public analyzer::tcp::TCP_ApplicationAnalyzer {
class SSL_Analyzer final : public analyzer::tcp::TCP_ApplicationAnalyzer
{
public:
explicit SSL_Analyzer(Connection* conn);
~SSL_Analyzer() override;
@ -31,8 +44,7 @@ public:
// Overridden from analyzer::tcp::TCP_ApplicationAnalyzer.
void EndpointEOF(bool is_orig) override;
static analyzer::Analyzer* Instantiate(Connection* conn)
{ return new SSL_Analyzer(conn); }
static analyzer::Analyzer* Instantiate(Connection* conn) { return new SSL_Analyzer(conn); }
/**
* Set the secret that should be used to derive keys for the
@ -133,6 +145,6 @@ protected:
std::string secret;
std::vector<u_char> keys;
zeek::analyzer::pia::PIA_TCP *pia;
};
};
} // namespace zeek::analyzer::ssl
} // namespace zeek::analyzer::ssl