diff --git a/CHANGES b/CHANGES index 9c69cb727a..529e06c643 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,5 @@ -2.3-551 | 2015-03-17 09:22:37 -0700 +2.3-553 | 2015-03-17 14:33:23 -0700 * Deprecate &rotate_interval, &rotate_size, &encrypt. Addresses BIT-1305. (Jon Siwek) diff --git a/VERSION b/VERSION index 74fa78ca1a..78bd132a6d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.3-551 +2.3-553 diff --git a/aux/broctl b/aux/broctl index 762d272229..71c86d87ff 160000 --- a/aux/broctl +++ b/aux/broctl @@ -1 +1 @@ -Subproject commit 762d2722290ca0004d0da2b0b96baea6a3a7f3f4 +Subproject commit 71c86d87ffd1750278a185ecff0ba5f5ae8fcf6e diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro b/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro index 1bca5b5c50..343b2fb196 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap %INPUT -# @TEST-EXEC: btest-diff ssl.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-x509-names btest-diff ssl.log @load protocols/ssl/validate-certs.bro diff --git a/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro b/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro index 19fca8cb89..40e5e09361 100644 --- a/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro +++ b/testing/btest/scripts/policy/protocols/ssl/validate-certs.bro @@ -2,6 +2,6 @@ # @TEST-EXEC: cat ssl.log > ssl-all.log # @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap %INPUT # @TEST-EXEC: cat ssl.log >> ssl-all.log -# @TEST-EXEC: btest-diff ssl-all.log +# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-x509-names btest-diff ssl-all.log @load protocols/ssl/validate-certs.bro