aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-07-16 23:16:19 +0200
committerGuy Harris <guy@alum.mit.edu>2015-07-16 23:36:18 +0000
commit45812a51a3dd01d89c6d25df9f3f1ce8bfa0b2e7 (patch)
tree52e1d60c2a3d2d32d1ed7ac987fa57f510244261 /test
parentb99f10bea7273574470cc87fcbd82acad3b0b29a (diff)
test: fix RSA decryption test under Windows
TEST_KEYS_DIR already contains a trailing slash. Windows does not like forward slashes, so drop the additional slash to fix tests under Windows. Fixes: v1.99.8rc0-417-g85f8a99 Bug: 11372 Change-Id: Ief794977281b70549369c344a193f4d48bcc1776 Reviewed-on: https://code.wireshark.org/review/9668 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'test')
-rwxr-xr-xtest/suite-decryption.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/suite-decryption.sh b/test/suite-decryption.sh
index a6c5857c1d..a1e9aee7b8 100755
--- a/test/suite-decryption.sh
+++ b/test/suite-decryption.sh
@@ -123,7 +123,7 @@ decryption_step_ssl() {
# (test whether libgcrypt is correctly called)
decryption_step_ssl_rsa_pq() {
$TESTS_DIR/run_and_catch_crashes env $TS_DC_ENV $TSHARK $TS_DC_ARGS -Tfields -e http.request.uri \
- -o ssl.keys_list:"0.0.0.0,443,http,${TEST_KEYS_DIR//\\/\\\\x5c}/rsa-p-lt-q.key" \
+ -o ssl.keys_list:"0.0.0.0,443,http,${TEST_KEYS_DIR//\\/\\\\x5c}rsa-p-lt-q.key" \
-r "$CAPTURE_DIR/rsa-p-lt-q.pcap" -Y http \
| grep / > /dev/null 2>&1
RETURNVALUE=$?