Parse custom extensions after internal extensions.

[openssl.git] / ssl / ssl_rsa.c

diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index d4f0e28a161d6daf4966321064b9e03727dcaa35..6f9337e1503228253ca19ea7842b78f8b603e7ba 100644 (file)
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -874,8 +874,8 @@ static int serverinfo_srv_parse_cb(SSL *s, unsigned int ext_type,
        }
 
 static int serverinfo_srv_add_cb(SSL *s, unsigned int ext_type,
-                                   const unsigned char **out, size_t *outlen,
-                                   int *al, void *arg)
+                                const unsigned char **out, size_t *outlen,
+                                int *al, void *arg)
        {
        const unsigned char *serverinfo = NULL;
        size_t serverinfo_length = 0;
@@ -920,9 +920,11 @@ static int serverinfo_process_buffer(const unsigned char *serverinfo,
 
                /* Register callbacks for extensions */
                ext_type = (serverinfo[0] << 8) + serverinfo[1];
-               if (ctx && !SSL_CTX_set_custom_srv_ext(ctx, ext_type, 
-                                                      serverinfo_srv_parse_cb,
-                                                      serverinfo_srv_add_cb, NULL))
+               if (ctx && !SSL_CTX_add_server_custom_ext(ctx, ext_type, 
+                                                         serverinfo_srv_add_cb,
+                                                         NULL, NULL,
+                                                         serverinfo_srv_parse_cb, 
+                                                         NULL))
                        return 0;
 
                serverinfo += 2;