diff --git a/CHANGES b/CHANGES index 61146d422d..17c152a539 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,13 @@ +2.5-459 | 2018-03-07 12:46:57 -0600 + + * Update a doc test/baseline (Corelight) + + * Add removed root certificate back to test that requires it. + + Test has a trace that contains a WoSign certificate - they are no longer + recognized by pretty much anyone. (Johanna Amann) + 2.5-457 | 2018-02-18 17:35:50 -0600 * Fix another warning when building the documentation (Daniel Thayer) diff --git a/VERSION b/VERSION index 08b0813b1e..4ad459c35c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5-457 +2.5-459 diff --git a/testing/btest/Baseline/doc.sphinx.include-doc_scripting_framework_logging_factorial_03_bro/output b/testing/btest/Baseline/doc.sphinx.include-doc_scripting_framework_logging_factorial_03_bro/output index d5d1c23b2b..01ed659c75 100644 --- a/testing/btest/Baseline/doc.sphinx.include-doc_scripting_framework_logging_factorial_03_bro/output +++ b/testing/btest/Baseline/doc.sphinx.include-doc_scripting_framework_logging_factorial_03_bro/output @@ -2,6 +2,43 @@ framework_logging_factorial_03.bro +module Factor; + +export { + redef enum Log::ID += { LOG }; + + type Info: record { + num: count &log; + factorial_num: count &log; + }; + } + +function factorial(n: count): count + { + if ( n == 0 ) + return 1; + + else + return (n * factorial(n - 1)); + } + +event bro_done() + { + local numbers: vector of count = vector(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); + for ( n in numbers ) + Log::write( Factor::LOG, [$num=numbers[n], + $factorial_num=factorial(numbers[n])]); + } + +function mod5(id: Log::ID, path: string, rec: Factor::Info) : string + { + if ( rec$factorial_num % 5 == 0 ) + return "factor-mod5"; + + else + return "factor-non5"; + } + event bro_init() { Log::create_stream(LOG, [$columns=Info, $path="factor"]); diff --git a/testing/btest/doc/sphinx/include-doc_scripting_framework_logging_factorial_03_bro.btest b/testing/btest/doc/sphinx/include-doc_scripting_framework_logging_factorial_03_bro.btest index d5d1c23b2b..01ed659c75 100644 --- a/testing/btest/doc/sphinx/include-doc_scripting_framework_logging_factorial_03_bro.btest +++ b/testing/btest/doc/sphinx/include-doc_scripting_framework_logging_factorial_03_bro.btest @@ -2,6 +2,43 @@ framework_logging_factorial_03.bro +module Factor; + +export { + redef enum Log::ID += { LOG }; + + type Info: record { + num: count &log; + factorial_num: count &log; + }; + } + +function factorial(n: count): count + { + if ( n == 0 ) + return 1; + + else + return (n * factorial(n - 1)); + } + +event bro_done() + { + local numbers: vector of count = vector(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); + for ( n in numbers ) + Log::write( Factor::LOG, [$num=numbers[n], + $factorial_num=factorial(numbers[n])]); + } + +function mod5(id: Log::ID, path: string, rec: Factor::Info) : string + { + if ( rec$factorial_num % 5 == 0 ) + return "factor-mod5"; + + else + return "factor-non5"; + } + event bro_init() { Log::create_stream(LOG, [$columns=Info, $path="factor"]);