453dfd8d5e
Currently, SSL tests are configured via command-line switches to ssltest.c. This results in a lot of duplication between ssltest.c and apps, and a complex setup. ssltest.c is also simply old and needs maintenance. Instead, we already have a way to configure SSL servers and clients, so we leverage that. SSL tests can now be configured from a configuration file. Test servers and clients are configured using the standard ssl_conf module. Additional test settings are configured via a test configuration. Moreover, since the CONF language involves unnecessary boilerplate, the test conf itself is generated from a shorter Perl syntax. The generated testcase files are checked in to the repo to make it easier to verify that the intended test cases are in fact run; and to simplify debugging failures. To demonstrate the approach, min/max protocol tests are converted to the new format. This change also fixes MinProtocol and MaxProtocol handling. It was previously requested that an SSL_CTX have both the server and client flags set for these commands; this clearly can never work. Guide to this PR: - test/ssl_test.c - test framework - test/ssl_test_ctx.* - test configuration structure - test/handshake_helper.* - new SSL test handshaking code - test/ssl-tests/ - test configurations - test/generate_ssl_tests.pl - script for generating CONF-style test configurations from perl inputs Reviewed-by: Richard Levitte <levitte@openssl.org>
54 lines
1.5 KiB
C
54 lines
1.5 KiB
C
/*
|
|
* Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* Licensed under the OpenSSL licenses, (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
* https://www.openssl.org/source/license.html
|
|
* or in the file LICENSE in the source distribution.
|
|
*/
|
|
|
|
#ifndef HEADER_SSL_TEST_CTX_H
|
|
#define HEADER_SSL_TEST_CTX_H
|
|
|
|
#include <openssl/conf.h>
|
|
#include <openssl/ssl.h>
|
|
|
|
typedef enum {
|
|
SSL_TEST_SUCCESS, /* Default */
|
|
SSL_TEST_SERVER_FAIL,
|
|
SSL_TEST_CLIENT_FAIL,
|
|
SSL_TEST_INTERNAL_ERROR
|
|
} ssl_test_result_t;
|
|
|
|
typedef struct ssl_test_ctx {
|
|
/* Test expectations. */
|
|
/* Defaults to SUCCESS. */
|
|
ssl_test_result_t expected_result;
|
|
/* Alerts. 0 if no expectation. */
|
|
/* See ssl.h for alert codes. */
|
|
/* Alert sent by the client / received by the server. */
|
|
int client_alert;
|
|
/* Alert sent by the server / received by the client. */
|
|
int server_alert;
|
|
/* Negotiated protocol version. 0 if no expectation. */
|
|
/* See ssl.h for protocol versions. */
|
|
int protocol;
|
|
} SSL_TEST_CTX;
|
|
|
|
const char *ssl_test_result_t_name(ssl_test_result_t result);
|
|
const char *ssl_alert_name(int alert);
|
|
const char *ssl_protocol_name(int protocol);
|
|
|
|
/*
|
|
* Load the test case context from |conf|.
|
|
* See test/README.ssl_test for details on the conf file format.
|
|
*/
|
|
SSL_TEST_CTX *SSL_TEST_CTX_create(const CONF *conf, const char *test_section);
|
|
|
|
SSL_TEST_CTX *SSL_TEST_CTX_new(void);
|
|
|
|
void SSL_TEST_CTX_free(SSL_TEST_CTX *ctx);
|
|
|
|
#endif /* HEADER_SSL_TEST_CTX_H */
|