diff options
| author | Brian Carlstrom <bdc@google.com> | 2012-01-04 13:22:32 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2012-01-04 14:13:49 -0800 |
| commit | 7b476c43f6a45574eb34697244b592e7b09f05a3 (patch) | |
| tree | d8526a6da6ff7fb5c876ab92414e36322d949820 /android.testssl | |
| parent | ce96fb211b9a44bbd7fb5ef7ed0e6c1244045c2e (diff) | |
| download | replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.zip replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.tar.gz replicant_openssl-7b476c43f6a45574eb34697244b592e7b09f05a3.tar.bz2 | |
Upgrade to openssl-1.0.0f
Bug: 5822335
Change-Id: Iadf81526a10b072ff323730db0e1897faea7a13f
Diffstat (limited to 'android.testssl')
| -rwxr-xr-x | android.testssl/testssl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android.testssl/testssl b/android.testssl/testssl index 3f24b1d..0eee92d 100755 --- a/android.testssl/testssl +++ b/android.testssl/testssl @@ -112,8 +112,8 @@ echo test sslv2/sslv3 via BIO pair $ssltest $extra || exit 1 if [ $dsa_cert = NO ]; then - echo test sslv2/sslv3 w/o DHE via BIO pair - $ssltest -bio_pair -no_dhe $extra || exit 1 + echo 'test sslv2/sslv3 w/o (EC)DHE via BIO pair' + $ssltest -bio_pair -no_dhe -no_ecdhe $extra || exit 1 fi echo test sslv2/sslv3 with 1024bit DHE via BIO pair @@ -143,8 +143,8 @@ fi if [ `adb shell /system/bin/openssl no-rsa` = no-dh ]; then 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 /sdcard/android.testssl/server2.pem -no_dhe -num 10 -f -time $extra || exit 1 + 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 if [ `adb shell /system/bin/openssl no-dh` = no-dh ]; then echo skipping RSA+DHE tests |