From 5ebda7cc09ae382235b5528b8e777f69279bbfda Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Wed, 11 Jun 2014 12:31:38 -0500 Subject: [PATCH] Fix doc/test that broke due to a Bro script change. --- CHANGES | 6 ++++++ VERSION | 2 +- doc/scripting/index.rst | 2 +- .../output | 1 + ...de-scripts_policy_protocols_ssl_expiring-certs_bro.btest | 1 + 5 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index ca4e06be2c..e6395e5b31 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,10 @@ +2.3-beta-22 | 2014-06-11 12:31:38 -0500 + + * Fix doc/test that broke due to a Bro script change. (Jon Siwek) + + * Remove unused --with-libmagic configure option. (Jon Siwek) + 2.3-beta-20 | 2014-06-10 18:16:51 -0700 * Fix use-after-free in some cases of reassigning a table index. diff --git a/VERSION b/VERSION index 0129370024..9f7e30ad0f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-beta-20 +2.3-beta-22 diff --git a/doc/scripting/index.rst b/doc/scripting/index.rst index d92314e41e..f994079ded 100644 --- a/doc/scripting/index.rst +++ b/doc/scripting/index.rst @@ -1222,7 +1222,7 @@ from the connection relative to the behavior that has been observed by Bro. .. btest-include:: ${BRO_SRC_ROOT}/scripts/policy/protocols/ssl/expiring-certs.bro - :lines: 60-63 + :lines: 64-68 In the :doc:`/scripts/policy/protocols/ssl/expiring-certs.bro` script which identifies when SSL certificates are set to expire and raises diff --git a/testing/btest/Baseline/doc.sphinx.include-scripts_policy_protocols_ssl_expiring-certs_bro/output b/testing/btest/Baseline/doc.sphinx.include-scripts_policy_protocols_ssl_expiring-certs_bro/output index 08661d0ea8..cc2d8817bd 100644 --- a/testing/btest/Baseline/doc.sphinx.include-scripts_policy_protocols_ssl_expiring-certs_bro/output +++ b/testing/btest/Baseline/doc.sphinx.include-scripts_policy_protocols_ssl_expiring-certs_bro/output @@ -5,4 +5,5 @@ expiring-certs.bro NOTICE([$note=Certificate_Expires_Soon, $msg=fmt("Certificate %s is going to expire at %T", cert$subject, cert$not_valid_after), $conn=c, $suppress_for=1day, + $identifier=cat(c$id$resp_h, c$id$resp_p, hash), $fuid=fuid]); diff --git a/testing/btest/doc/sphinx/include-scripts_policy_protocols_ssl_expiring-certs_bro.btest b/testing/btest/doc/sphinx/include-scripts_policy_protocols_ssl_expiring-certs_bro.btest index 08661d0ea8..cc2d8817bd 100644 --- a/testing/btest/doc/sphinx/include-scripts_policy_protocols_ssl_expiring-certs_bro.btest +++ b/testing/btest/doc/sphinx/include-scripts_policy_protocols_ssl_expiring-certs_bro.btest @@ -5,4 +5,5 @@ expiring-certs.bro NOTICE([$note=Certificate_Expires_Soon, $msg=fmt("Certificate %s is going to expire at %T", cert$subject, cert$not_valid_after), $conn=c, $suppress_for=1day, + $identifier=cat(c$id$resp_h, c$id$resp_p, hash), $fuid=fuid]);