mirror of
https://github.com/zeek/zeek.git
synced 2025-10-14 12:38:20 +00:00
Revert "Merge remote-tracking branch 'origin/topic/vern/at-if-analyze'"
This reverts commit4e797ddbbc
, reversing changes made to3ac28ba5a2
.
This commit is contained in:
parent
cfbb7eb8ee
commit
5a3abbe364
78 changed files with 340 additions and 1286 deletions
|
@ -41,16 +41,17 @@ export {
|
|||
global add_secret: event(client_random: string, secrets: string);
|
||||
}
|
||||
|
||||
@if ( keylog_file == "" )
|
||||
# If a keylog file was given via an environment variable, let's disable secret expiration - that does not
|
||||
# make sense for pcaps.
|
||||
global secrets: table[string] of string = {} &redef;
|
||||
global keys: table[string] of string = {} &redef;
|
||||
|
||||
@if ( keylog_file != "" ) &analyze
|
||||
# If a keylog file was given directly (not via an environment variable),
|
||||
# set up secret expiration (which doesn't make sense for PCAPs).
|
||||
redef secrets &read_expire=secret_expiration;
|
||||
redef keys &read_expire=secret_expiration;
|
||||
@else
|
||||
global secrets: table[string] of string = {} &read_expire=secret_expiration &redef;
|
||||
global keys: table[string] of string = {} &read_expire=secret_expiration &redef;
|
||||
@endif
|
||||
|
||||
|
||||
redef record SSL::Info += {
|
||||
# Decryption uses client_random as identifier
|
||||
client_random: string &optional;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue