diff options
| author | David Benjamin <davidben@google.com> | 2017-09-07 18:53:05 -0400 |
|---|---|---|
| committer | Benjamin Kaduk <kaduk@mit.edu> | 2017-09-08 13:58:59 -0500 |
| commit | f1b97da1fd90cf3935eafedc8df0d0165cb75f2f (patch) | |
| tree | 6db3aa66ae0837c2e2a0dec5c065ef021962e384 /test | |
| parent | f90486f4def6c20e3021405068b69533d164244f (diff) | |
Introduce named constants for the ClientHello callback.
It is otherwise unclear what all the magic numbers mean.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/4349)
Diffstat (limited to 'test')
| -rw-r--r-- | test/handshake_helper.c | 18 | ||||
| -rw-r--r-- | test/sslapitest.c | 10 |
2 files changed, 15 insertions, 13 deletions
diff --git a/test/handshake_helper.c b/test/handshake_helper.c index 5e5c311cf3..3d59abc66b 100644 --- a/test/handshake_helper.c +++ b/test/handshake_helper.c @@ -224,18 +224,18 @@ static int client_hello_ignore_cb(SSL *s, int *al, void *arg) { if (!client_hello_select_server_ctx(s, arg, 1)) { *al = SSL_AD_UNRECOGNIZED_NAME; - return 0; + return SSL_CLIENT_HELLO_ERROR; } - return 1; + return SSL_CLIENT_HELLO_SUCCESS; } static int client_hello_reject_cb(SSL *s, int *al, void *arg) { if (!client_hello_select_server_ctx(s, arg, 0)) { *al = SSL_AD_UNRECOGNIZED_NAME; - return 0; + return SSL_CLIENT_HELLO_ERROR; } - return 1; + return SSL_CLIENT_HELLO_SUCCESS; } static int client_hello_nov12_cb(SSL *s, int *al, void *arg) @@ -247,7 +247,7 @@ static int client_hello_nov12_cb(SSL *s, int *al, void *arg) v = SSL_client_hello_get0_legacy_version(s); if (v > TLS1_2_VERSION || v < SSL3_VERSION) { *al = SSL_AD_PROTOCOL_VERSION; - return 0; + return SSL_CLIENT_HELLO_ERROR; } (void)SSL_client_hello_get0_session_id(s, &p); if (p == NULL || @@ -255,13 +255,15 @@ static int client_hello_nov12_cb(SSL *s, int *al, void *arg) SSL_client_hello_get0_ciphers(s, &p) == 0 || SSL_client_hello_get0_compression_methods(s, &p) == 0) { *al = SSL_AD_INTERNAL_ERROR; - return 0; + return SSL_CLIENT_HELLO_ERROR; } ret = client_hello_select_server_ctx(s, arg, 0); SSL_set_max_proto_version(s, TLS1_1_VERSION); - if (!ret) + if (!ret) { *al = SSL_AD_UNRECOGNIZED_NAME; - return ret; + return SSL_CLIENT_HELLO_ERROR; + } + return SSL_CLIENT_HELLO_SUCCESS; } static unsigned char dummy_ocsp_resp_good_val = 0xff; diff --git a/test/sslapitest.c b/test/sslapitest.c index 7437020d58..5299d5794b 100644 --- a/test/sslapitest.c +++ b/test/sslapitest.c @@ -422,24 +422,24 @@ static int full_client_hello_callback(SSL *s, int *al, void *arg) /* Make sure we can defer processing and get called back. */ if ((*ctr)++ == 0) - return -1; + return SSL_CLIENT_HELLO_RETRY; len = SSL_client_hello_get0_ciphers(s, &p); if (!TEST_mem_eq(p, len, expected_ciphers, sizeof(expected_ciphers)) || !TEST_size_t_eq( SSL_client_hello_get0_compression_methods(s, &p), 1) || !TEST_int_eq(*p, 0)) - return 0; + return SSL_CLIENT_HELLO_ERROR; if (!SSL_client_hello_get1_extensions_present(s, &exts, &len)) - return 0; + return SSL_CLIENT_HELLO_ERROR; if (len != OSSL_NELEM(expected_extensions) || memcmp(exts, expected_extensions, len * sizeof(*exts)) != 0) { printf("ClientHello callback expected extensions mismatch\n"); OPENSSL_free(exts); - return 0; + return SSL_CLIENT_HELLO_ERROR; } OPENSSL_free(exts); - return 1; + return SSL_CLIENT_HELLO_SUCCESS; } static int test_client_hello_cb(void) |