aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJeff Morriss <jeff.morriss@ulticom.com>2012-03-30 19:57:48 +0000
committerJeff Morriss <jeff.morriss@ulticom.com>2012-03-30 19:57:48 +0000
commitc4678fb771520c7cf4858437861a4527a01da925 (patch)
tree217fbef54b327ff7869c9e1c320ee5208fc37129 /test
parent005e724d27a7ad8dbdda44e285f67db5aa316940 (diff)
rsasnakeoil2 is a PCAP file; name it .pcap for consistency. Set SVN properties appropriately.
svn path=/trunk/; revision=41858
Diffstat (limited to 'test')
-rw-r--r--[-rwxr-xr-x]test/captures/rsasnakeoil2.pcap (renamed from test/captures/rsasnakeoil2.cap)bin25057 -> 25057 bytes
-rwxr-xr-xtest/suite-decryption.sh2
2 files changed, 1 insertions, 1 deletions
diff --git a/test/captures/rsasnakeoil2.cap b/test/captures/rsasnakeoil2.pcap
index a1c6bd4fb4..a1c6bd4fb4 100755..100644
--- a/test/captures/rsasnakeoil2.cap
+++ b/test/captures/rsasnakeoil2.pcap
Binary files differ
diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh
index d6a81eb5f5..c4ac8ec8e1 100755
--- a/test/suite-decryption.sh
+++ b/test/suite-decryption.sh
@@ -50,7 +50,7 @@ DC_ID="suite-decryption.sh-$$"
# SSL
decryption_step_ssl() {
- env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri -r captures/rsasnakeoil2.cap -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 -R http | grep favicon.ico > /dev/null 2>&1
RETURNVALUE=$?
if [ ! $RETURNVALUE -eq $EXIT_OK ]; then
test_step_failed "Failed to decrypt SSL"