diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-01-09 18:42:15 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-01-10 04:26:47 +0100 |
| commit | 1ed327f7dfe02a062e50cd844a925c970c645c7c (patch) | |
| tree | fe990396e51677cb28a46947a273460fd3677f02 /ssl | |
| parent | Use typedefs for PSK, NPN, ALPN callback functions (diff) | |
| download | openssl-1ed327f7dfe02a062e50cd844a925c970c645c7c.tar.xz openssl-1ed327f7dfe02a062e50cd844a925c970c645c7c.zip | |
Review comments
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2052)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/ssl_locl.h | 4 | ||||
| -rw-r--r-- | ssl/ssl_sess.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index 0f6e94844a..4010985f23 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3237,7 +3237,7 @@ long ssl3_callback_ctrl(SSL *s, int cmd, void (*fp) (void)) #endif case SSL_CTRL_SET_TLSEXT_DEBUG_CB: s->ext.debug_cb = (void (*)(SSL *, int, int, - const unsigned char *, int, void *))fp; + const unsigned char *, int, void *))fp; break; case SSL_CTRL_SET_NOT_RESUMABLE_SESS_CB: diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 84a91a125f..641438dfe3 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1032,8 +1032,8 @@ struct ssl_st { struct { /* TLS extension debug callback */ - void (*debug_cb) (SSL *s, int client_server, int type, - const unsigned char *data, int len, void *arg); + void (*debug_cb)(SSL *s, int client_server, int type, + const unsigned char *data, int len, void *arg); void *debug_arg; char *hostname; /* certificate status request info */ diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index df49d85cae..0ea74389c2 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -961,7 +961,7 @@ int SSL_set_session_ticket_ext(SSL *s, void *ext_data, int ext_len) return 0; } - if (ext_data) { + if (ext_data != NULL) { s->ext.session_ticket->length = ext_len; s->ext.session_ticket->data = s->ext.session_ticket + 1; memcpy(s->ext.session_ticket->data, ext_data, ext_len); |