summaryrefslogtreecommitdiffstats
path: root/apps/s_client.c
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2014-08-14 13:25:50 +0100
committerDr. Stephen Henson <steve@openssl.org>2014-08-28 18:10:21 +0100
commit423ceb831903339b589ea7b94c877ed190a7cb64 (patch)
tree4226211a169afa5456294e2996c80c8d0567ac70 /apps/s_client.c
parentcd2e17020e6ce6ba1d29d643bfaf1758302c8ca7 (diff)
Callback revision.
Use "parse" and "add" for function and callback names instead of "first" and "second". Change arguments to callback so the extension type is unsigned int and the buffer length is size_t. Note: this *will* break existing code. Reviewed-by: Emilia Käsper <emilia@openssl.org> (cherry picked from commit de2a9e38f39eacc2e052d694f5b5fa5b7e734abc)
Diffstat (limited to 'apps/s_client.c')
-rw-r--r--apps/s_client.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index af349f9e44..818445768a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -548,8 +548,8 @@ 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 short ext_type,
- const unsigned char* in, unsigned short inlen,
+static int serverinfo_cli_cb(SSL* s, unsigned int ext_type,
+ const unsigned char* in, size_t inlen,
int* al, void* arg)
{
char pem_name[100];