New extension callback features.

[openssl.git] / ssl / t1_ext.c

diff --git a/ssl/t1_ext.c b/ssl/t1_ext.c
index bd14806e6a6fe89969bf7e802b97236b3b7aedf2..115e4345eaae54e7e1ae7380653972f6acacad69 100644 (file)
--- a/ssl/t1_ext.c
+++ b/ssl/t1_ext.c
@@ -87,9 +87,9 @@ void custom_ext_init(custom_ext_methods *exts)
 /* pass received custom extension data to the application for parsing */
 
 int custom_ext_parse(SSL *s, int server,
 /* pass received custom extension data to the application for parsing */
 
 int custom_ext_parse(SSL *s, int server,

-                       unsigned short ext_type,
+                       unsigned int ext_type,

                        const unsigned char *ext_data, 
                        const unsigned char *ext_data, 

-                       unsigned short ext_size,
+                       size_t ext_size,

                        int *al)
        {
        custom_ext_methods *exts = server ? &s->cert->srv_ext : &s->cert->cli_ext;
                        int *al)
        {
        custom_ext_methods *exts = server ? &s->cert->srv_ext : &s->cert->cli_ext;


@@ -120,7 +120,7 @@ int custom_ext_parse(SSL *s, int server,
        if (!meth->parse_cb)
                return 1;
 
        if (!meth->parse_cb)
                return 1;
 

-       return meth->parse_cb(s, ext_type, ext_data, ext_size, al, meth->arg);
+       return meth->parse_cb(s, ext_type, ext_data, ext_size, al, meth->parse_arg);

        }
 
 /* request custom extension data from the application and add to the
        }
 
 /* request custom extension data from the application and add to the


@@ -140,7 +140,7 @@ int custom_ext_add(SSL *s, int server,
        for (i = 0; i < exts->meths_count; i++)
                {
                const unsigned char *out = NULL;
        for (i = 0; i < exts->meths_count; i++)
                {
                const unsigned char *out = NULL;

-               unsigned short outlen = 0;
+               size_t outlen = 0;

                meth = exts->meths + i;
 
                if (server)
                meth = exts->meths + i;
 
                if (server)


@@ -159,13 +159,13 @@ int custom_ext_add(SSL *s, int server,
                        int cb_retval = 0;
                        cb_retval = meth->add_cb(s, meth->ext_type,
                                                        &out, &outlen, al,
                        int cb_retval = 0;
                        cb_retval = meth->add_cb(s, meth->ext_type,
                                                        &out, &outlen, al,

-                                                       meth->arg);
-                       if (cb_retval == 0)
+                                                       meth->add_arg);
+                       if (cb_retval < 0)

                                return 0; /* error */
                                return 0; /* error */

-                       if (cb_retval == -1)
+                       if (cb_retval == 0)

                                        continue; /* skip this extension */
                        }
                                        continue; /* skip this extension */
                        }

-               if (4 > limit - ret || outlen > limit - ret - 4)
+               if (4 > limit - ret || outlen > (size_t)(limit - ret - 4))

                        return 0;
                s2n(meth->ext_type, ret);
                s2n(outlen, ret);
                        return 0;
                s2n(meth->ext_type, ret);
                s2n(outlen, ret);


@@ -182,6 +182,8 @@ int custom_ext_add(SSL *s, int server,
                 * sent in ServerHello.
                 */
                meth->ext_flags |= SSL_EXT_FLAG_SENT;
                 * sent in ServerHello.
                 */
                meth->ext_flags |= SSL_EXT_FLAG_SENT;

+               if (meth->free_cb)
+                       meth->free_cb(s, meth->ext_type, out, meth->add_arg);

                }
        *pret = ret;
        return 1;
                }
        *pret = ret;
        return 1;


@@ -209,10 +211,11 @@ void custom_exts_free(custom_ext_methods *exts)
 
 /* Set callbacks for a custom extension */
 static int custom_ext_set(custom_ext_methods *exts,
 
 /* Set callbacks for a custom extension */
 static int custom_ext_set(custom_ext_methods *exts,

-                       unsigned short ext_type,
-                       custom_ext_parse_cb parse_cb,
+                       unsigned int ext_type,

                        custom_ext_add_cb add_cb,
                        custom_ext_add_cb add_cb,

-                       void *arg)
+                       custom_ext_free_cb free_cb,
+                       void *add_arg,
+                       custom_ext_parse_cb parse_cb, void *parse_arg)

        {
        custom_ext_method *meth;
        /* See if it is a supported internally */
        {
        custom_ext_method *meth;
        /* See if it is a supported internally */


@@ -239,6 +242,9 @@ static int custom_ext_set(custom_ext_methods *exts,
 #endif
                return 0;
                }
 #endif
                return 0;
                }

+       /* Extension type must fit in 16 bits */
+       if (ext_type > 0xffff)
+               return 0;

        /* Search for duplicate */
        if (custom_ext_find(exts, ext_type))
                return 0;
        /* Search for duplicate */
        if (custom_ext_find(exts, ext_type))
                return 0;


@@ -255,25 +261,36 @@ static int custom_ext_set(custom_ext_methods *exts,
        memset(meth, 0, sizeof(custom_ext_method));
        meth->parse_cb = parse_cb;
        meth->add_cb = add_cb;
        memset(meth, 0, sizeof(custom_ext_method));
        meth->parse_cb = parse_cb;
        meth->add_cb = add_cb;

+       meth->free_cb = free_cb;

        meth->ext_type = ext_type;
        meth->ext_type = ext_type;

-       meth->arg = arg;
+       meth->add_arg = add_arg;
+       meth->parse_arg = parse_arg;

        exts->meths_count++;
        return 1;
        }
 
 /* Application level functions to add custom extension callbacks */
 
        exts->meths_count++;
        return 1;
        }
 
 /* Application level functions to add custom extension callbacks */
 

-int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned short ext_type,
-                              custom_cli_ext_first_cb_fn fn1, 
-                              custom_cli_ext_second_cb_fn fn2, void *arg)
+int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned int ext_type,
+                              custom_ext_add_cb add_cb,
+                              custom_ext_free_cb free_cb,
+                               void *add_arg,
+                              custom_ext_parse_cb parse_cb, void *parse_arg)
+

        {
        {

-       return custom_ext_set(&ctx->cert->cli_ext, ext_type, fn2, fn1, arg);
+       return custom_ext_set(&ctx->cert->cli_ext, ext_type,
+                               add_cb, free_cb, add_arg,
+                               parse_cb, parse_arg);

        }
 
        }
 

-int SSL_CTX_set_custom_srv_ext(SSL_CTX *ctx, unsigned short ext_type,
-                              custom_srv_ext_first_cb_fn fn1, 
-                              custom_srv_ext_second_cb_fn fn2, void *arg)
+int SSL_CTX_set_custom_srv_ext(SSL_CTX *ctx, unsigned int ext_type,
+                              custom_ext_add_cb add_cb,
+                              custom_ext_free_cb free_cb,
+                               void *add_arg,
+                              custom_ext_parse_cb parse_cb, void *parse_arg)

        {
        {

-       return custom_ext_set(&ctx->cert->srv_ext, ext_type, fn1, fn2, arg);
+       return custom_ext_set(&ctx->cert->srv_ext, ext_type,
+                               add_cb, free_cb, add_arg,
+                               parse_cb, parse_arg);

        }
 #endif
        }
 #endif