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

Merge remote-tracking branch 'origin/master' into topic/dnthayer/ticket1467

Browse source
This commit is contained in:
Johanna Amann 2015-10-02 11:31:00 -07:00
commit 630e9f22d2
71 changed files with 603 additions and 558 deletions
Download patch file Download diff file Expand all files Collapse all files

18
testing/scripts/diff-remove-x509-names
View file

@ -1,8 +1,9 @@
#! /usr/bin/awk -f
#! /usr/bin/env bash
#
# A diff canonifier that removes all X.509 Distinguished Name subject fields
# because that output can differ depending on installed OpenSSL version.
awk '
BEGIN { FS="\t"; OFS="\t"; s_col = -1; i_col = -1; is_col = -1; cs_col = -1; ci_col = -1; cert_subj_col = -1; cert_issuer_col = -1 }
/^#/ {
@ -33,46 +34,47 @@ BEGIN { FS="\t"; OFS="\t"; s_col = -1; i_col = -1; is_col = -1; cs_col = -1; ci_
s_col > 0 {
if ( $s_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$s_col = "+";
}
i_col > 0 {
if ( $i_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$i_col = "+";
}
is_col > 0 {
if ( $is_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$is_col = "+";
}
cs_col > 0 {
if ( $cs_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$cs_col = "+";
}
ci_col > 0 {
if ( $ci_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$ci_col = "+";
}
cert_subj_col > 0 {
if ( $cert_subj_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$cert_subj_col = "+";
}
cert_issuer_col > 0 {
if ( $cert_issuer_col != "-" )
# Mark that it's set, but ignore content.
# Mark that it is set, but ignore content.
$cert_issuer_col = "+";
}
{
print;
}
'