Add NOTES.ANDROID.

[openssl.git] / test / sslcorrupttest.c

diff --git a/test/sslcorrupttest.c b/test/sslcorrupttest.c
index a92e0d79d371d171b5c626744e588297bb1b793b..192310036adcc81d40f90e0894be3d91202a70f3 100644 (file)
--- a/test/sslcorrupttest.c
+++ b/test/sslcorrupttest.c
@@ -202,19 +202,17 @@ static int test_ssl_corrupt(int testidx)
         goto end;
 
     if (!TEST_ptr(ciphers = SSL_CTX_get_ciphers(cctx))
+            || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ""))
             || !TEST_int_eq(sk_SSL_CIPHER_num(ciphers), 1)
             || !TEST_ptr(currcipher = sk_SSL_CIPHER_value(ciphers, 0)))
         goto end;
 
     /*
-     * If we haven't got a TLSv1.3 cipher, then we mustn't attempt to use
-     * TLSv1.3. Version negotiation happens before cipher selection, so we will
-     * get a "no shared cipher" error.
+     * No ciphers we are using are TLSv1.3 compatible so we should not attempt
+     * to negotiate TLSv1.3
      */
-    if (strcmp(SSL_CIPHER_get_version(currcipher), "TLSv1.3") != 0) {
-        if (!TEST_true(SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION)))
-            goto end;
-    }
+    if (!TEST_true(SSL_CTX_set_max_proto_version(cctx, TLS1_2_VERSION)))
+        goto end;
 
     if (!TEST_ptr(c_to_s_fbio = BIO_new(bio_f_tls_corrupt_filter())))
         goto end;
@@ -248,24 +246,24 @@ static int test_ssl_corrupt(int testidx)
     return testresult;
 }
 
-int test_main(int argc, char *argv[])
+int setup_tests(void)
 {
-    int ret = EXIT_FAILURE, n;
+    int n;
 
-    if (argc != 3) {
-        TEST_error("Usage error: require cert and private key files");
-        return ret;
+    if (!TEST_ptr(cert = test_get_argument(0))
+            || !TEST_ptr(privkey = test_get_argument(1))) {
+        TEST_note("Usage error: require cert and private key files");
+        return 0;
     }
-    cert = argv[1];
-    privkey = argv[2];
 
     n = setup_cipher_list();
-    if (n > 0) {
+    if (n > 0)
         ADD_ALL_TESTS(test_ssl_corrupt, n);
-        ret = run_tests(argv[0]);
-    }
+    return 1;
+}
+
+void cleanup_tests(void)
+{
     bio_f_tls_corrupt_filter_free();
     OPENSSL_free(cipher_list);
-
-    return ret;
 }