osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Use -Y instead of -R to filter tshark in decryption tests. We're not doing 

2-pass analysis so -Y makes more sense and doesn't print deprecation warnings.

svn path=/trunk/; revision=48808
This commit is contained in:
Evan Huus 2013-04-10 14:27:24 +00:00
parent 29b61239bc
commit 0a396007fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/suite-decryption.sh
View File

@ -72,7 +72,7 @@ decryption_step_80211_wpa_psk() {
-o "wlan.enable_decryption: TRUE" \
-Tfields -e http.request.uri \
-r captures/wpa-Induction.pcap.gz \
-R http \
-Y http \
| grep favicon.ico > /dev/null 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
@ -87,7 +87,7 @@ decryption_step_80211_wpa_psk() {
decryption_step_dtls() {
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
-Tfields -e data.data \
-r captures/snakeoil-dtls.pcap -R http \
-r captures/snakeoil-dtls.pcap -Y http \
| grep "69:74:20:77:6f:72:6b:20:21:0a" > /dev/null 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
@ -100,7 +100,7 @@ decryption_step_dtls() {
# SSL
# http://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil2_070531.tgz
decryption_step_ssl() {
env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri -r captures/rsasnakeoil2.pcap -R http | grep favicon.ico > /dev/null 2>&1
env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri -r captures/rsasnakeoil2.pcap -Y http | grep favicon.ico > /dev/null 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
test_step_failed "Failed to decrypt SSL"
@ -115,7 +115,7 @@ decryption_step_zigbee() {
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
-r captures/sample_control4_2012-03-24.pcap \
-Tfields -e data.data \
-R zbee_aps \
-Y zbee_aps \
| grep "30:67:63:63:38:65:20:63:34:2e:64:6d:2e:74:76:20" > /dev/null 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then