generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't break out of the custom extension callback loop - continue instead

Browse Source 
The contract for custom extension callbacks has changed - all custom extension callbacks are triggered
This commit is contained in:
Scott Deboy 2014-02-04 18:48:59 -08:00
parent 130ebe34c8
commit 5a32dd8930
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ssl/ssltest.c
View File

@ -501,8 +501,7 @@ static int custom_ext_0_cli_second_cb(SSL *s, unsigned short ext_type,
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,
@ -521,8 +520,7 @@ static int custom_ext_1_cli_second_cb(SSL *s, unsigned short ext_type,
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,
@ -579,8 +577,7 @@ static int custom_ext_0_srv_first_cb(SSL *s, unsigned short ext_type,
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 */

4
ssl/t1_lib.c
View File

@ -1718,14 +1718,14 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha
/* 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);