Don't break out of the custom extension callback loop - continue instead
The contract for custom extension callbacks has changed - all custom extension callbacks are triggered
diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index bf09c6d..64c6743 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -576,8 +576,7 @@
unsigned short inlen, int *al,
void *arg)
{
- custom_ext_error = 1; /* Shouldn't be called */
- return 0;
+ return 1;
}
static int custom_ext_1_cli_first_cb(SSL *s, unsigned short ext_type,
@@ -596,8 +595,7 @@
unsigned short inlen, int *al,
void *arg)
{
- custom_ext_error = 1; /* Shouldn't be called */
- return 0;
+ return 1;
}
static int custom_ext_2_cli_first_cb(SSL *s, unsigned short ext_type,
@@ -654,8 +652,7 @@
unsigned short inlen, int *al,
void *arg)
{
- custom_ext_error = 1;
- return 0; /* Shouldn't be called */
+ return 1;
}
/* 'generate' callbacks are always called, even if the 'receive' callback isn't called */
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 0626fc6..6c988d1 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1708,14 +1708,14 @@
/* NULL callback or -1 omits extension */
if (!record->fn2)
- break;
+ continue;
cb_retval = record->fn2(s, record->ext_type,
&out, &outlen, al,
record->arg);
if (cb_retval == 0)
return NULL; /* error */
if (cb_retval == -1)
- break; /* skip this extension */
+ continue; /* skip this extension */
if (limit < ret + 4 + outlen)
return NULL;
s2n(record->ext_type, ret);
