diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2014-08-26 01:20:26 +0100 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2014-08-28 17:06:53 +0100 |
commit | f47e203975133ddbae3cde20c8c3c0516f62066c (patch) | |
tree | 76661ab8486cfe5763d45d82bbb44adcef1e2270 | |
parent | f3f56c2a87951e115a7f82d06826e72c9e13987f (diff) |
Fix comments, add new test.
Fix comments in ssltest.c: return value of 0 now means extension is
omitted and add_cb is not called for servers if the corresponding
extension is absent in ClientHello.
Test add_cb is not called if extension is not received.
Reviewed-by: Emilia Käsper <emilia@openssl.org>
-rw-r--r-- | ssl/ssltest.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ssl/ssltest.c b/ssl/ssltest.c index 4dd7c8b47a..bc13e4cb2b 100644 --- a/ssl/ssltest.c +++ b/ssl/ssltest.c @@ -636,20 +636,23 @@ static int custom_ext_3_cli_parse_cb(SSL *s, unsigned int ext_type, return 1; } -/* custom_ext_0_cli_parse_cb returns -1 - the server won't receive a callback for this extension */ +/* custom_ext_0_cli_add_cb returns 0 - the server won't receive a callback for this extension */ static int custom_ext_0_srv_parse_cb(SSL *s, unsigned int ext_type, const unsigned char *in, size_t inlen, int *al, void *arg) { + custom_ext_error = 1; return 1; } -/* 'generate' callbacks are always called, even if the 'receive' callback isn't called */ +/* 'add' callbacks are only called if the 'parse' callback is called */ static int custom_ext_0_srv_add_cb(SSL *s, unsigned int ext_type, const unsigned char **out, size_t *outlen, int *al, void *arg) { + /* Error: should not have been called */ + custom_ext_error = 1; return 0; /* Don't send an extension */ } |