diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-02 13:41:10 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-02 16:49:28 +0000 |
| commit | b6611753a6d9bef6a8c16850a9eb9215d8a84fac (patch) | |
| tree | e39b072f2d86c8db226f0c8d10133376a22d751f /test/ssl_test_ctx.c | |
| parent | 439db0c97bd50cae008e876c6c8ed5e5011bf6eb (diff) | |
| download | openssl-b6611753a6d9bef6a8c16850a9eb9215d8a84fac.tar.gz | |
Use the built in boolean type for CompressionExpected
Don't create a custom boolean type for parsing CompressionExpected. Use
the existing one instead.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2814)
Diffstat (limited to 'test/ssl_test_ctx.c')
| -rw-r--r-- | test/ssl_test_ctx.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/test/ssl_test_ctx.c b/test/ssl_test_ctx.c index e746dbd942..d668f51f51 100644 --- a/test/ssl_test_ctx.c +++ b/test/ssl_test_ctx.c @@ -288,26 +288,7 @@ const char *ssl_session_ticket_name(ssl_session_ticket_t server) /* CompressionExpected */ -static const test_enum ssl_compression[] = { - {"Yes", SSL_TEST_COMPRESSION_YES}, - {"No", SSL_TEST_COMPRESSION_NO}, -}; - -__owur static int parse_compression(SSL_TEST_CTX *test_ctx, const char *value) -{ - int ret_value; - if (!parse_enum(ssl_compression, OSSL_NELEM(ssl_compression), - &ret_value, value)) { - return 0; - } - test_ctx->compression_expected = ret_value; - return 1; -} - -const char *ssl_compression_name(ssl_compression_t comp) -{ - return enum_name(ssl_compression, OSSL_NELEM(ssl_compression), comp); -} +IMPLEMENT_SSL_TEST_BOOL_OPTION(SSL_TEST_CTX, test, compression_expected) /* Method */ @@ -564,7 +545,7 @@ static const ssl_test_ctx_option ssl_test_ctx_options[] = { { "ExpectedProtocol", &parse_protocol }, { "ExpectedServerName", &parse_expected_servername }, { "SessionTicketExpected", &parse_session_ticket }, - { "CompressionExpected", &parse_compression }, + { "CompressionExpected", &parse_test_compression_expected }, { "Method", &parse_test_method }, { "ExpectedNPNProtocol", &parse_test_expected_npn_protocol }, { "ExpectedALPNProtocol", &parse_test_expected_alpn_protocol }, |