mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-27 05:21:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix comments, add new test.

Browse Source 
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>
This commit is contained in:
Dr. Stephen Henson 2014-08-26 01:20:26 +01:00
parent f3f56c2a87
commit f47e203975
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ssl/ssltest.c
View File

@ -636,20 +636,23 @@ static int custom_ext_3_cli_parse_cb(SSL *s, unsigned int ext_type,
return 1; 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, static int custom_ext_0_srv_parse_cb(SSL *s, unsigned int ext_type,
const unsigned char *in, const unsigned char *in,
size_t inlen, int *al, size_t inlen, int *al,
void *arg) void *arg)
{ {
custom_ext_error = 1;
return 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, static int custom_ext_0_srv_add_cb(SSL *s, unsigned int ext_type,
const unsigned char **out, const unsigned char **out,
size_t *outlen, int *al, void *arg) size_t *outlen, int *al, void *arg)
{ {
/* Error: should not have been called */
custom_ext_error = 1;
return 0; /* Don't send an extension */ return 0; /* Don't send an extension */
} }