When piping tshark to something else, run it with run_and_catch_crashes.
That got the crash information in the WPA EAPOL Rekey test; use it for all other tests where, otherwise, the crash information would be lost. Change-Id: I230b7952b6d79ebf6dc003747dc05328616ef7c2 Reviewed-on: https://code.wireshark.org/review/8394 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris
parent
c8394b8b6f
commit
0617b1a0aa
|
|
@ -60,7 +60,7 @@ DIFF_OUT=./diff-output.txt
|
|||
# WPA PSK
|
||||
# https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=wpa-Induction.pcap
|
||||
decryption_step_80211_wpa_psk() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-o "wlan.enable_decryption: TRUE" \
|
||||
-Tfields -e http.request.uri \
|
||||
-r "$CAPTURE_DIR/wpa-Induction.pcap.gz" \
|
||||
|
|
@ -93,7 +93,7 @@ decryption_step_80211_wpa_eap() {
|
|||
# DTLS
|
||||
# https://wiki.wireshark.org/SampleCaptures?action=AttachFile&do=view&target=snakeoil.tgz
|
||||
decryption_step_dtls() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-Tfields -e data.data \
|
||||
-r "$CAPTURE_DIR/snakeoil-dtls.pcap" -Y data \
|
||||
| grep "69:74:20:77:6f:72:6b:20:21:0a" > /dev/null 2>&1
|
||||
|
|
@ -108,7 +108,7 @@ decryption_step_dtls() {
|
|||
# SSL, using the server's private key
|
||||
# https://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 \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \
|
||||
-r "$CAPTURE_DIR/rsasnakeoil2.pcap" -Y http \
|
||||
| grep favicon.ico > /dev/null 2>&1
|
||||
RETURNVALUE=$?
|
||||
|
|
@ -121,7 +121,7 @@ decryption_step_ssl() {
|
|||
|
||||
# SSL, using the master secret
|
||||
decryption_step_ssl_master_secret() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \
|
||||
-o "ssl.keylog_file: $TEST_KEYS_DIR/dhe1_keylog.dat" \
|
||||
-o "ssl.desegment_ssl_application_data: FALSE" \
|
||||
-o "http.ssl.port: 443" \
|
||||
|
|
@ -138,7 +138,7 @@ decryption_step_ssl_master_secret() {
|
|||
# ZigBee
|
||||
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7022
|
||||
decryption_step_zigbee() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-r "$CAPTURE_DIR/sample_control4_2012-03-24.pcap" \
|
||||
-Tfields -e data.data \
|
||||
-Y zbee_aps \
|
||||
|
|
@ -154,7 +154,7 @@ decryption_step_zigbee() {
|
|||
# ANSI C12.22
|
||||
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9196
|
||||
decryption_step_c1222() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-o "c1222.decrypt: TRUE" \
|
||||
-o "c1222.baseoid:2.16.124.113620.1.22.0" \
|
||||
-r "$CAPTURE_DIR/c1222_std_example8.pcap" \
|
||||
|
|
@ -172,7 +172,7 @@ decryption_step_c1222() {
|
|||
# simplified version of the sample capture in
|
||||
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6700
|
||||
decryption_step_dvb_ci() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-o "dvb-ci.sek: 00000000000000000000000000000000" \
|
||||
-o "dvb-ci.siv: 00000000000000000000000000000000" \
|
||||
-Tfields -e dvb-ci.cc.sac.padding \
|
||||
|
|
@ -189,7 +189,7 @@ decryption_step_dvb_ci() {
|
|||
# IKEv1 (ISAKMP) with certificates
|
||||
# https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7951
|
||||
decryption_step_ikev1_certs() {
|
||||
env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS \
|
||||
-Tfields -e x509sat.printableString \
|
||||
-r "$CAPTURE_DIR/ikev1-certs.pcap" \
|
||||
| grep "OpenSwan" > /dev/null 2>&1
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ CUSTOM_PROFILE_NAME="Custom-$$"
|
|||
# nameres.hosts_file_handling: False
|
||||
# Profile: Default
|
||||
name_resolution_net_t_ext_f_hosts_f_global() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: FALSE" \
|
||||
|
|
@ -54,7 +54,7 @@ name_resolution_net_t_ext_f_hosts_f_global() {
|
|||
# nameres.hosts_file_handling: False
|
||||
# Profile: Default
|
||||
name_resolution_net_t_ext_f_hosts_f_personal() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: FALSE" \
|
||||
|
|
@ -72,7 +72,7 @@ name_resolution_net_t_ext_f_hosts_f_personal() {
|
|||
# nameres.hosts_file_handling: False
|
||||
# Profile: Custom
|
||||
name_resolution_net_t_ext_f_hosts_f_custom() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: FALSE" \
|
||||
|
|
@ -91,7 +91,7 @@ name_resolution_net_t_ext_f_hosts_f_custom() {
|
|||
# nameres.hosts_file_handling: True
|
||||
# Profile: Default
|
||||
name_resolution_net_t_ext_f_hosts_t_global() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: TRUE" \
|
||||
|
|
@ -109,7 +109,7 @@ name_resolution_net_t_ext_f_hosts_t_global() {
|
|||
# nameres.hosts_file_handling: True
|
||||
# Profile: Default
|
||||
name_resolution_net_t_ext_f_hosts_t_personal() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: TRUE" \
|
||||
|
|
@ -127,7 +127,7 @@ name_resolution_net_t_ext_f_hosts_t_personal() {
|
|||
# nameres.hosts_file_handling: True
|
||||
# Profile: Custom
|
||||
name_resolution_net_t_ext_f_hosts_t_custom() {
|
||||
env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
$TESTS_DIR/run_and_catch_crashes env $TS_NR_ENV $TSHARK $TS_NR_ARGS \
|
||||
-o "nameres.network_name: TRUE" \
|
||||
-o "nameres.use_external_name_resolver: FALSE" \
|
||||
-o "nameres.hosts_file_handling: TRUE" \
|
||||
|
|
|
|||
Loading…
Reference in New Issue