commit 754106713fd349be267ec0dfe6f4f8a97c1b3cdb
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Wed Aug 08 09:50:01 2012 -0400
tree 767702dc681aea550f7c8c626e936e019981b7dc
parent ace91efcc58b8704c3e8e9c03e33afc1a59aecc3

#14465: Update openssl to tag android-4.0.4_r2.1

jni/openssl/android.testssl/testssl

diff --git a/jni/openssl/android.testssl/testssl b/jni/openssl/android.testssl/testssl
index 96a90d1..3f24b1d 100755
--- a/jni/openssl/android.testssl/testssl
+++ b/jni/openssl/android.testssl/testssl
@@ -112,8 +112,8 @@
 $ssltest $extra || exit 1
 
 if [ $dsa_cert = NO ]; then
-  echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair'
-  $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1
+  echo test sslv2/sslv3 w/o DHE via BIO pair
+  $ssltest -bio_pair -no_dhe $extra || exit 1
 fi
 
 echo test sslv2/sslv3 with 1024bit DHE via BIO pair
@@ -143,8 +143,8 @@
 if [ `adb shell /system/bin/openssl no-rsa` = no-dh ]; then
   echo skipping RSA tests
 else
-  echo 'test tls1 with 1024bit RSA, no (EC)DHE, multiple handshakes'
-  adb shell /system/bin/ssltest -v -bio_pair -tls1 -cert /sdcard/android.testssl/server2.pem -no_dhe -no_ecdhe -num 10 -f -time $extra || exit 1
+  echo test tls1 with 1024bit RSA, no DHE, multiple handshakes
+  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
@@ -160,14 +160,4 @@
 echo test tls1 with PSK via BIO pair
 $ssltest -bio_pair -tls1 -cipher PSK -psk abc123 $extra || exit 1
 
-if adb shell /system/bin/openssl no-srp; then
-  echo skipping SRP tests
-else
-  echo test tls1 with SRP
-  $ssltest -tls1 -cipher SRP -srpuser test -srppass abc123
-
-  echo test tls1 with SRP via BIO pair
-  $ssltest -bio_pair -tls1 -cipher SRP -srpuser test -srppass abc123
-fi
-
 exit 0