New extension callback features.

[openssl.git] / apps / s_client.c

diff --git a/apps/s_client.c b/apps/s_client.c
index e1be6a908b6ab93122a625c07f27c7e9f7570662..e4007c290575ea9191fa111defb5f7ac6f71d00e 100644 (file)
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -547,8 +547,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];
@@ -1363,7 +1363,7 @@ bad:
                                {
                                SSL_CTX_set_custom_cli_ext(ctx,
                                                           serverinfo_types[i],
-                                                          NULL, 
+                                                          NULL, NULL, NULL,
                                                           serverinfo_cli_cb,
                                                           NULL);
                                }