diff options
| author | Scott Deboy <sdeboy@secondstryke.com> | 2014-02-04 18:48:59 -0800 |
|---|---|---|
| committer | Ben Laurie <ben@links.org> | 2014-02-05 18:25:47 +0000 |
| commit | 9dabfce1a88ca00c0542502db51b60de8d8e3e79 (patch) | |
| tree | 60af26e56df4d5a228a9bb69ccb22d02b7c651d2 /ssl | |
| parent | 0a6028757a77769f09d5c6dd3a541971224a5d81 (diff) | |
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
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssltest.c | 9 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index bf09c6d82b..64c6743b37 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -576,8 +576,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, @@ -596,8 +595,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, @@ -654,8 +652,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 */ diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 0626fc6fcb..6c988d1829 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1708,14 +1708,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); |