New extension callback features.
[openssl.git] / ssl / t1_ext.c
index 8b6c170ef6e4c90f21f36a97013a140414956ab6..115e4345eaae54e7e1ae7380653972f6acacad69 100644 (file)
@@ -120,7 +120,7 @@ int custom_ext_parse(SSL *s, int server,
        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
@@ -159,10 +159,10 @@ int custom_ext_add(SSL *s, int server,
                        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 */
-                       if (cb_retval == -1)
+                       if (cb_retval == 0)
                                        continue; /* skip this extension */
                        }
                if (4 > limit - ret || outlen > (size_t)(limit - ret - 4))
@@ -182,6 +182,8 @@ int custom_ext_add(SSL *s, int server,
                 * 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;
@@ -210,9 +212,10 @@ void custom_exts_free(custom_ext_methods *exts)
 /* Set callbacks for a custom extension */
 static int custom_ext_set(custom_ext_methods *exts,
                        unsigned int ext_type,
-                       custom_ext_parse_cb parse_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 */
@@ -258,8 +261,10 @@ 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;
+       meth->free_cb = free_cb;
        meth->ext_type = ext_type;
-       meth->arg = arg;
+       meth->add_arg = add_arg;
+       meth->parse_arg = parse_arg;
        exts->meths_count++;
        return 1;
        }
@@ -267,19 +272,25 @@ static int custom_ext_set(custom_ext_methods *exts,
 /* Application level functions to add custom extension callbacks */
 
 int SSL_CTX_set_custom_cli_ext(SSL_CTX *ctx, unsigned int ext_type,
-                              custom_ext_add_cb add_cb, 
-                              custom_ext_parse_cb parse_cb, void *arg)
+                              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, parse_cb, add_cb,
-                                                                       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 int ext_type,
-                              custom_ext_parse_cb parse_cb, 
-                              custom_ext_add_cb add_cb, void *arg)
+                              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, parse_cb, add_cb,
-                                                                       arg);
+       return custom_ext_set(&ctx->cert->srv_ext, ext_type,
+                               add_cb, free_cb, add_arg,
+                               parse_cb, parse_arg);
        }
 #endif