From: Rich Salz <rsalz@openssl.org>
Date: Mon, 9 Jan 2017 17:42:15 +0000 (-0500)
Subject: Review comments
X-Git-Tag: OpenSSL_1_1_1-pre1~2738
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1ed327f7dfe02a062e50cd844a925c970c645c7c;p=oweals%2Fopenssl.git

Review comments

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2052)
---

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);