From 64fc80d7e4a4c1a653a16bf3d3892c50982fcffa Mon Sep 17 00:00:00 2001
From: Robin Sommer <robin@icir.org>
Date: Thu, 25 Jul 2013 13:31:57 -0700
Subject: [PATCH] Adding a trace with a DNSKEY RR.

Still had this sitting in my inbox, but seems Bro is doing everything
right.
---
 CHANGES                                          |   4 ++++
 VERSION                                          |   2 +-
 .../scripts.base.protocols.dns.dns-key/dns.log   |  10 ++++++++++
 testing/btest/Traces/dns-dnskey.trace            | Bin 0 -> 1110 bytes
 .../btest/scripts/base/protocols/dns/dns-key.bro |   4 ++++
 5 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log
 create mode 100644 testing/btest/Traces/dns-dnskey.trace
 create mode 100644 testing/btest/scripts/base/protocols/dns/dns-key.bro

diff --git a/CHANGES b/CHANGES
index f4b7e43a7e..0c7235bd47 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.1-895 | 2013-07-29 14:07:35 -0700
+
+  * Adding a test for a DNSKEY RR. (Robin Sommer)
+
 2.1-894 | 2013-07-29 16:44:41 -0400
 
   * Updates for the Intel Framework. (Seth Hall)
diff --git a/VERSION b/VERSION
index 3131a2159f..9e4a84ae0a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.1-894
+2.1-895
diff --git a/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log b/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log
new file mode 100644
index 0000000000..722d2c3912
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.protocols.dns.dns-key/dns.log
@@ -0,0 +1,10 @@
+#separator \x09
+#set_separator	,
+#empty_field	(empty)
+#unset_field	-
+#path	dns
+#open	2013-07-25-20-29-44
+#fields	ts	uid	id.orig_h	id.orig_p	id.resp_h	id.resp_p	proto	trans_id	query	qclass	qclass_name	qtype	qtype_name	rcode	rcode_name	AA	TC	RD	RA	Z	answers	TTLs	rejected
+#types	time	string	addr	port	addr	port	enum	count	string	count	string	count	string	count	string	bool	bool	bool	bool	count	vector[string]	vector[interval]	bool
+1359565680.761790	UWkUyAuUGXf	192.168.6.10	53209	192.168.129.36	53	udp	41477	paypal.com	1	C_INTERNET	48	DNSKEY	0	NOERROR	F	F	T	F	1	-	-	F
+#close	2013-07-25-20-29-44
diff --git a/testing/btest/Traces/dns-dnskey.trace b/testing/btest/Traces/dns-dnskey.trace
new file mode 100644
index 0000000000000000000000000000000000000000..c7a6448e7990c6717c5f8da73cb1c300bcb4f534
GIT binary patch
literal 1110
zcmca|c+)~A1{MYw`2U}Qff2|l2<8mjH=mm!5Xc5$1_qw_pW+x)Crs=x;$U!PU~s++
zROui%Py4_MHm(CJ8dc8UWH4pWcg<eJ$|wLf0%#ChL1JY=Vh(e1el7!p0Z3F+0BBSL
z5Q8jmILgCtmYD&JAx1N(&5&hw1X;kmKU~a#;i;g}43Oa<OBhVg-(+6BCuI?9;{>2l
zAU9)JaDWG54dZb}4n{_1R%S*9#;dtA^fp<tefd3E`01NNUy^b-_m)Jtx?Ee#kf-Tj
zK56FVKb-vU_^*F$e0w^a+a+Dd@N?LvWqJpTUH3j)(qAy!UH;kR8kS<A(C^O6)s@W^
zXB+Ds(U|w!=E3i&8q3tWdyY?e`J+Tib^4SGC$FoyRIFT}?<MuK<929Pm*0-o3$+5z
zbuYX);_~5ZRjR`Nf=Sc2Hs<9y+_V#u*<mX)|L41+HjbISFPFI~GON_L9#LheKNk91
z@Y1g5Vw$~IuU%BEnjIUsh#{|_jW=;}o_=xXid|ltKD+HYT+z8<c5nY=fuDsgK2ZxV
zD2N|X3pn`8ODp2%?t2H$8wEdDAZm1U|A!|Ny~Cd)!i1rNkpU7W=YOx?W3|G=^4p(J
zwTBic<(;}GXTFWo%VNe0aiyKpB~ov`d*6Ow!#>+P2bQoGp4N|geL&lL*-Vp7o5g}J
zOiDO>LZzj#t#jUXgDH3N+L@~@Bs=(DJ$&)9_txXvJ9M5Uv@@M)`XV5jrn9D|M{BEK
zj=kgJuFnx?+O1ZkHpCv_)Yx<#=q5c-a$r2pFpt52m5G6YDI!ogN+96($re3j<YXhb
zL-$|fhETO)op+*a3!*QDX*If+^={2>DJs_1%i&kO`s>{Z8<XYRrak7LHqr0@#6$+E
zHK86a_E+q@vD-9wZ`_)seI`0jkH_D;6Pt5T;)~f*R*}zAo9<lQHvgsc_WHg;@m-5Q
zeVxFRe$#JG&OF6U3ob0u61?4Y<8a@Oy!HDWN&*f(g1MAY4&9|ey2viw_`IDhdZAN^
z$DO(>M|mvw@lF;N;3?2<lw+{%e(cMBD}}Y*BrrSWT}AMRY3=gM?@x2nNv+bHpT&EN
z<62Ve+@4*tzxsxY_lKNMe4fv9Nnuv}?FCoQuCSLVt;_PO=J;I8c<^Jn_pW~pWx2W+
zKi{oe>080u$S?4>&_C<&yL@pE_lvLnHLi$pWcCLAeH59Sd_SVCU72I2Nv_F-U(Y3u
zuF+j~iP2hWx@U{{ansb?GncbZ>{+uk<(5eOq;(DongKd%=l!cz_v1ZwpL^2O!*+=_
zQNB;P&ZV6-%1D@y_C%nUKX3u>mkPzOzfFq-YEE7~c%^ENUE}|3m&h%;YpkYC^3+iV
LW^UFVNah9rRu9Wl

literal 0
HcmV?d00001

diff --git a/testing/btest/scripts/base/protocols/dns/dns-key.bro b/testing/btest/scripts/base/protocols/dns/dns-key.bro
new file mode 100644
index 0000000000..c51788c605
--- /dev/null
+++ b/testing/btest/scripts/base/protocols/dns/dns-key.bro
@@ -0,0 +1,4 @@
+# Making sure DNSKEY gets logged as such.
+#
+# @TEST-EXEC: bro -r $TRACES/dns-dnskey.trace
+# @TEST-EXEC: btest-diff dns.log