/*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
*
- * Licensed under the OpenSSL license (the "License"). You may not use
+ * Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
#include <string.h>
#include "ssltestlib.h"
#include "testutil.h"
-#include "test_main_custom.h"
+
+DEFINE_STACK_OF(SSL_CIPHER)
static int docorrupt = 0;
char *copy;
if (docorrupt) {
- copy = BUF_memdup(in, inl);
- TEST_check(copy != NULL);
+ if (!TEST_ptr(copy = OPENSSL_memdup(in, inl)))
+ return 0;
/* corrupt last bit of application data */
copy[inl-1] ^= 1;
ret = BIO_write(next, copy, inl);
*/
static const char **cipher_list = NULL;
-static int setup_cipher_list()
+static int setup_cipher_list(void)
{
SSL_CTX *ctx = NULL;
SSL *ssl = NULL;
- static STACK_OF(SSL_CIPHER) *sk_ciphers = NULL;
- int i, numciphers;
+ STACK_OF(SSL_CIPHER) *sk_ciphers = NULL;
+ int i, j, numciphers = 0;
- ctx = SSL_CTX_new(TLS_server_method());
- TEST_check(ctx != NULL);
- ssl = SSL_new(ctx);
- TEST_check(ssl != NULL);
- sk_ciphers = SSL_get1_supported_ciphers(ssl);
- TEST_check(sk_ciphers != NULL);
+ if (!TEST_ptr(ctx = SSL_CTX_new(TLS_server_method()))
+ || !TEST_ptr(ssl = SSL_new(ctx))
+ || !TEST_ptr(sk_ciphers = SSL_get1_supported_ciphers(ssl)))
+ goto err;
/*
* The |cipher_list| will be filled only with names of RSA ciphers,
*/
cipher_list = OPENSSL_malloc(sk_SSL_CIPHER_num(sk_ciphers) *
sizeof(cipher_list[0]));
- TEST_check(cipher_list != NULL);
+ if (!TEST_ptr(cipher_list))
+ goto err;
- for (numciphers = 0, i = 0; i < sk_SSL_CIPHER_num(sk_ciphers); i++) {
+ for (j = 0, i = 0; i < sk_SSL_CIPHER_num(sk_ciphers); i++) {
const SSL_CIPHER *cipher = sk_SSL_CIPHER_value(sk_ciphers, i);
if (SSL_CIPHER_get_auth_nid(cipher) == NID_auth_rsa)
- cipher_list[numciphers++] = SSL_CIPHER_get_name(cipher);
+ cipher_list[j++] = SSL_CIPHER_get_name(cipher);
}
- TEST_check(numciphers != 0);
+ if (TEST_int_ne(j, 0))
+ numciphers = j;
+err:
sk_SSL_CIPHER_free(sk_ciphers);
SSL_free(ssl);
SSL_CTX_free(ctx);
TEST_info("Starting #%d, %s", testidx, cipher_list[testidx]);
- if (!TEST_true(create_ssl_ctx_pair(TLS_server_method(),
- TLS_client_method(), &sctx,
- &cctx, cert, privkey)))
+ if (!TEST_true(create_ssl_ctx_pair(NULL, TLS_server_method(),
+ TLS_client_method(),
+ TLS1_VERSION, 0,
+ &sctx, &cctx, cert, privkey)))
return 0;
- if (!TEST_true(SSL_CTX_set_cipher_list(cctx, cipher_list[testidx])))
- goto end;
-
- if (!TEST_ptr(ciphers = SSL_CTX_get_ciphers(cctx))
+ if (!TEST_true(SSL_CTX_set_cipher_list(cctx, cipher_list[testidx]))
+ || !TEST_true(SSL_CTX_set_ciphersuites(cctx, ""))
+ || !TEST_ptr(ciphers = SSL_CTX_get_ciphers(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;
return testresult;
}
-int test_main(int argc, char *argv[])
+OPT_TEST_DECLARE_USAGE("certfile privkeyfile\n")
+
+int setup_tests(void)
{
- int ret;
+ int n;
- if (argc != 3) {
- TEST_error("Usage error");
+ if (!test_skip_common_options()) {
+ TEST_error("Error parsing test options\n");
return 0;
}
- cert = argv[1];
- privkey = argv[2];
- ADD_ALL_TESTS(test_ssl_corrupt, setup_cipher_list());
+ if (!TEST_ptr(cert = test_get_argument(0))
+ || !TEST_ptr(privkey = test_get_argument(1)))
+ return 0;
+
+ n = setup_cipher_list();
+ if (n > 0)
+ ADD_ALL_TESTS(test_ssl_corrupt, n);
+ return 1;
+}
- ret = run_tests(argv[0]);
+void cleanup_tests(void)
+{
bio_f_tls_corrupt_filter_free();
OPENSSL_free(cipher_list);
-
- return ret;
}