diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2014-08-19 14:02:50 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2014-08-28 18:10:21 +0100 |
| commit | cf8d6c1000f7f3d91a1f3052556614f14f140e82 (patch) | |
| tree | 55a1b1c7f74ad8ff3988412a211e4d6de95bd560 /apps | |
| parent | 4164d631bbc6bc0462f1461a4eea006692810049 (diff) | |
Rename some callbacks, fix alignment.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
(cherry picked from commit 0cfefe4b6dcc6947c236b0f10a7f9e2f02273075)
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index bfb6e52cc5..ffd3a4b50f 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -548,9 +548,9 @@ static int next_proto_cb(SSL *s, unsigned char **out, unsigned char *outlen, con } # endif /* ndef OPENSSL_NO_NEXTPROTONEG */ -static int serverinfo_cli_cb(SSL* s, unsigned int ext_type, - const unsigned char* in, size_t inlen, - int* al, void* arg) +static int serverinfo_cli_parse_cb(SSL* s, unsigned int ext_type, + const unsigned char* in, size_t inlen, + int* al, void* arg) { char pem_name[100]; unsigned char ext_buf[4 + 65536]; @@ -1334,16 +1334,13 @@ bad: } #endif #ifndef OPENSSL_NO_TLSEXT - if (serverinfo_types_count) + for (i = 0; i < serverinfo_types_count; i++) { - for (i = 0; i < serverinfo_types_count; i++) - { - SSL_CTX_add_client_custom_ext(ctx, - serverinfo_types[i], - NULL, NULL, NULL, - serverinfo_cli_cb, - NULL); - } + SSL_CTX_add_client_custom_ext(ctx, + serverinfo_types[i], + NULL, NULL, NULL, + serverinfo_cli_parse_cb, + NULL); } #endif |