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

Add/fix log fields in x509 diff canonifier.

Browse source
This commit is contained in:
Jon Siwek 2015-02-05 10:04:04 -06:00
parent 08bb4b2274
commit 8859c73bde
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,19 +3,25 @@
# A diff canonifier that removes all X.509 Distinguished Name subject fields # A diff canonifier that removes all X.509 Distinguished Name subject fields
# because that output can differ depending on installed OpenSSL version. # because that output can differ depending on installed OpenSSL version.
BEGIN { FS="\t"; OFS="\t"; s_col = -1; i_col = -1; cs_col = -1; ci_col = -1 } 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 }
/^#fields/ { /^#fields/ {
for ( i = 2; i < NF; ++i ) for ( i = 2; i < NF; ++i )
{ {
if ( $i == "subject" ) if ( $i == "subject" )
s_col = i-1; s_col = i-1;
if ( $i == "issuer_subject" ) if ( $i == "issuer" )
i_col = i-1; i_col = i-1;
if ( $i == "issuer_subject" )
is_col = i-1;
if ( $i == "client_subject" ) if ( $i == "client_subject" )
cs_col = i-1; cs_col = i-1;
if ( $i == "client_issuer_subject" ) if ( $i == "client_issuer" )
ci_col = i-1; ci_col = i-1;
if ( $i == "certificate.subject" )
cert_subj_col = i-1;
if ( $i == "certificate.issuer" )
cert_issuer_col = i-1;
} }
} }
@ -31,6 +37,12 @@ i_col >= 0 {
$i_col = "+"; $i_col = "+";
} }
is_col >= 0 {
if ( $is_col != "-" )
# Mark that it's set, but ignore content.
$is_col = "+";
}
cs_col >= 0 { cs_col >= 0 {
if ( $cs_col != "-" ) if ( $cs_col != "-" )
# Mark that it's set, but ignore content. # Mark that it's set, but ignore content.
@ -43,6 +55,18 @@ ci_col >= 0 {
$ci_col = "+"; $ci_col = "+";
} }
cert_subj_col >= 0 {
if ( $cert_subj_col != "-" )
# Mark that it's set, but ignore content.
$cert_subj_col = "+";
}
cert_issuer_col >= 0 {
if ( $cert_issuer_col != "-" )
# Mark that it's set, but ignore content.
$cert_issuer_col = "+";
}
{ {
print; print;
} }