Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/topic/johanna/cert-validation'

Browse source 
* origin/topic/johanna/cert-validation:
  add x509 canonifiers to test to not make it fail on differing openssl versions.
This commit is contained in:
Robin Sommer 2015-03-17 14:33:23 -07:00
commit b0e066d3e0
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGES
View file

@ -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 * Deprecate &rotate_interval, &rotate_size, &encrypt. Addresses
BIT-1305. (Jon Siwek) BIT-1305. (Jon Siwek)

2
VERSION
View file

@ -1 +1 @@
2.3-551 2.3-553

2
aux/broctl

@ -1 +1 @@
Subproject commit 762d2722290ca0004d0da2b0b96baea6a3a7f3f4 Subproject commit 71c86d87ffd1750278a185ecff0ba5f5ae8fcf6e

2
testing/btest/scripts/policy/protocols/ssl/validate-certs-no-cache.bro
View file

@ -1,5 +1,5 @@
# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap %INPUT # @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 @load protocols/ssl/validate-certs.bro

2
testing/btest/scripts/policy/protocols/ssl/validate-certs.bro
View file

@ -2,6 +2,6 @@
# @TEST-EXEC: cat ssl.log > ssl-all.log # @TEST-EXEC: cat ssl.log > ssl-all.log
# @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap %INPUT # @TEST-EXEC: bro -C -r $TRACES/tls/missing-intermediate.pcap %INPUT
# @TEST-EXEC: cat ssl.log >> ssl-all.log # @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 @load protocols/ssl/validate-certs.bro