commit 1266eefdb66db6c01e859ae672ccc19261e75bbf
author Matt Caswell <matt@openssl.org> Wed Dec 07 17:04:46 2016 +0000
committer Matt Caswell <matt@openssl.org> Thu Dec 08 17:20:58 2016 +0000
tree fa8b4586164117dd882e51f30623b8389ce2e4af
parent 89247375efcf0869449a711fd248f160627de2a2

Various style updates following extensions refactor

Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>

ssl/statem/statem_clnt.c

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 38b8ecb..7017615 100644
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -1132,7 +1132,7 @@
      * server wants to resume.
      */
     if (s->version >= TLS1_VERSION && !SSL_IS_TLS13(s)
-            && s->tls_session_secret_cb && s->session->tlsext_tick) {
+            && s->tls_session_secret_cb != NULL && s->session->tlsext_tick) {
         const SSL_CIPHER *pref_cipher = NULL;
         /*
          * s->session->master_key_length is a size_t, but this is an int for
@@ -3112,10 +3112,11 @@
      */
     if (!tls_collect_extensions(s, &extensions,
                                 EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-                                | EXT_TLS1_3_CERTIFICATE, &rawexts, &al)
+                                    | EXT_TLS1_3_CERTIFICATE,
+                                &rawexts, &al)
             || !tls_parse_all_extensions(s,
                                          EXT_TLS1_3_ENCRYPTED_EXTENSIONS
-                                         | EXT_TLS1_3_CERTIFICATE,
+                                            | EXT_TLS1_3_CERTIFICATE,
                                          rawexts, &al))
         goto err;