fix /mnt/sdcard to /sdcard in android.testssl
found when merging to dalvik-dev where test failed because of incorrect path
Change-Id: Ib87af202fdf4027d8c133a27bd956227c6d741e6
diff --git a/android.testssl/CAss.cnf b/android.testssl/CAss.cnf
index 13f72e2..a7959c0 100644
--- a/android.testssl/CAss.cnf
+++ b/android.testssl/CAss.cnf
@@ -3,7 +3,7 @@
# This is mostly being used for generation of certificate requests.
#
-RANDFILE = /mnt/sdcard/android.testssl/.rnd
+RANDFILE = /sdcard/android.testssl/.rnd
####################################################################
[ req ]
diff --git a/android.testssl/Uss.cnf b/android.testssl/Uss.cnf
index a85948e..1244a57 100644
--- a/android.testssl/Uss.cnf
+++ b/android.testssl/Uss.cnf
@@ -3,7 +3,7 @@
# This is mostly being used for generation of certificate requests.
#
-RANDFILE = /mnt/sdcard/android.testssl/.rnd
+RANDFILE = /sdcard/android.testssl/.rnd
####################################################################
[ req ]
diff --git a/android.testssl/testssl b/android.testssl/testssl
index 7ff7099..049fe2f 100755
--- a/android.testssl/testssl
+++ b/android.testssl/testssl
@@ -142,13 +142,13 @@
echo skipping RSA tests
else
echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
- adb shell /system/bin/ssltest -v -bio_pair -tls1 -cert /mnt/sdcard/android.testssl/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
+ adb shell /system/bin/ssltest -v -bio_pair -tls1 -cert /sdcard/android.testssl/server2.pem -no_dhe -num 10 -f -time $extra || exit 1
if [ `adb shell /system/bin/openssl no-dh` = no-dh ]; then
echo skipping RSA+DHE tests
else
echo test tls1 with 1024bit RSA, 1024bit DHE, multiple handshakes
- adb shell /system/bin/ssltest -v -bio_pair -tls1 -cert /mnt/sdcard/android.testssl/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
+ adb shell /system/bin/ssltest -v -bio_pair -tls1 -cert /sdcard/android.testssl/server2.pem -dhe1024dsa -num 10 -f -time $extra || exit 1
fi
fi
diff --git a/import_openssl.sh b/import_openssl.sh
index 5c10c18..15efce3 100755
--- a/import_openssl.sh
+++ b/import_openssl.sh
@@ -151,12 +151,12 @@
sed 's#../util/shlib_wrap.sh ../apps/openssl#adb shell /system/bin/openssl#' | \
sed 's#adb shell /system/bin/openssl no-dh#[ `adb shell /system/bin/openssl no-dh` = no-dh ]#' | \
sed 's#adb shell /system/bin/openssl no-rsa#[ `adb shell /system/bin/openssl no-rsa` = no-dh ]#' | \
- sed 's#../apps/server2.pem#/mnt/sdcard/android.testssl/server2.pem#' | \
+ sed 's#../apps/server2.pem#/sdcard/android.testssl/server2.pem#' | \
cat > \
android.testssl/testssl
chmod +x android.testssl/testssl
- cat test/Uss.cnf | sed 's#./.rnd#/mnt/sdcard/android.testssl/.rnd#' >> android.testssl/Uss.cnf
- cat test/CAss.cnf | sed 's#./.rnd#/mnt/sdcard/android.testssl/.rnd#' >> android.testssl/CAss.cnf
+ cat test/Uss.cnf | sed 's#./.rnd#/sdcard/android.testssl/.rnd#' >> android.testssl/Uss.cnf
+ cat test/CAss.cnf | sed 's#./.rnd#/sdcard/android.testssl/.rnd#' >> android.testssl/CAss.cnf
cp apps/server2.pem android.testssl/
cp ../patches/testssl.sh android.testssl/
