Various style fixes following review feedback

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)

diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h
index 077d9d315d0fa1f48fa87b5b996795ef3bc1ad1f..c7bfa22f8b1f8452416e72e5bb60eb9dc6966438 100644 (file)
--- a/ssl/ssl_locl.h
+++ b/ssl/ssl_locl.h
@@ -2197,12 +2197,19 @@ __owur int tls1_set_server_sigalgs(SSL *s);
 
 /* Return codes for tls_get_ticket_from_client() and tls_decrypt_ticket() */
 typedef enum ticket_en {
+    /* fatal error, malloc failure */
     TICKET_FATAL_ERR_MALLOC,
+    /* fatal error, either from parsing or decrypting the ticket */
     TICKET_FATAL_ERR_OTHER,
+    /* No ticket present */
     TICKET_NONE,
+    /* Empty ticket present */
     TICKET_EMPTY,
+    /* the ticket couldn't be decrypted */
     TICKET_NO_DECRYPT,
+    /* a ticket was successfully decrypted */
     TICKET_SUCCESS,
+    /* same as above but the ticket needs to be reneewed */
     TICKET_SUCCESS_RENEW
 } TICKET_RETURN;
 

diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c
index b5bb427a833e94c5d322c9153a8acc1c367f4708..ddd949d4b4b9740c11943e11233f547489422c69 100644 (file)
--- a/ssl/ssl_sess.c
+++ b/ssl/ssl_sess.c
@@ -640,9 +640,9 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al)
     if (fatal) {
         *al = SSL_AD_INTERNAL_ERROR;
         return -1;
-    } else {
-        return 0;
     }
+
+    return 0;
 }
 
 int SSL_CTX_add_session(SSL_CTX *ctx, SSL_SESSION *c)

diff --git a/ssl/statem/extensions_clnt.c b/ssl/statem/extensions_clnt.c
index 738ab6b054a6014f868fd9de2622b59996e46465..ceae77f124093dfad34e6687bac7c5bff2b140e5 100644 (file)
--- a/ssl/statem/extensions_clnt.c
+++ b/ssl/statem/extensions_clnt.c
@@ -666,7 +666,7 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, X509 *x, size_t chainidx,
                            int *al)
 {
 #ifndef OPENSSL_NO_TLS1_3
-    uint32_t now, ages, agems;
+    uint32_t now, agesec, agems;
     size_t hashsize, binderoffset, msglen;
     unsigned char *binder = NULL, *msgstart = NULL;
     const EVP_MD *md;
@@ -682,6 +682,11 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, X509 *x, size_t chainidx,
             || s->session->ext.ticklen == 0)
         return 1;
 
+    if (s->session->cipher == NULL) {
+        SSLerr(SSL_F_TLS_CONSTRUCT_CTOS_PSK, ERR_R_INTERNAL_ERROR);
+        goto err;
+    }
+
     md = ssl_md(s->session->cipher->algorithm2);
     if (md == NULL) {
         /* Don't recognise this cipher so we can't use the session. Ignore it */
@@ -696,9 +701,9 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, X509 *x, size_t chainidx,
      * in the code, so portability shouldn't be an issue.
      */
     now = (uint32_t)time(NULL);
-    ages = now - (uint32_t)s->session->time;
+    agesec = now - (uint32_t)s->session->time;
 
-    if (s->session->ext.tick_lifetime_hint < ages) {
+    if (s->session->ext.tick_lifetime_hint < agesec) {
         /* Ticket is too old. Ignore it. */
         return 1;
     }
@@ -707,9 +712,9 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, X509 *x, size_t chainidx,
      * Calculate age in ms. We're just doing it to nearest second. Should be
      * good enough.
      */
-    agems = ages * (uint32_t)1000;
+    agems = agesec * (uint32_t)1000;
 
-    if (ages != 0 && agems / (uint32_t)1000 != ages) {
+    if (agesec != 0 && agems / (uint32_t)1000 != agesec) {
         /*
          * Overflow. Shouldn't happen unless this is a *really* old session. If
          * so we just ignore it.
@@ -723,11 +728,6 @@ int tls_construct_ctos_psk(SSL *s, WPACKET *pkt, X509 *x, size_t chainidx,
      */
     agems += s->session->ext.tick_age_add;
 
-    if (s->session->cipher == NULL) {
-        SSLerr(SSL_F_TLS_CONSTRUCT_CTOS_PSK, ERR_R_INTERNAL_ERROR);
-        goto err;
-    }
-
     hashsize = EVP_MD_size(md);
 
     /* Create the extension, but skip over the binder for now */

diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 35af6338d463cb7c1397e4773eedceda31fee097..a7239c7d872e8919567150288d2dd39605a4d05d 100644 (file)
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -1118,15 +1118,6 @@ TICKET_RETURN tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello,
  *   sesslen: the length of the session ID.
  *   psess: (output) on return, if a ticket was decrypted, then this is set to
  *       point to the resulting session.
- *
- * Returns:
- *   TICKET_FATAL_ERR_MALLOC: fatal error, malloc failure.
- *   TICKET_FATAL_ERR_OTHER:  fatal error, either from parsing or decrypting the
- *                            ticket.
- *   TICKET_NO_DECRYPT:       the ticket couldn't be decrypted.
- *   TICKET_SUCCESS:          a ticket was successfully decrypted and *psess was
- *                            set.
- *   TICKET_SUCCESS_RENEW:    same as 3, but the ticket needs to be renewed
  */
 TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick,
                                  size_t eticklen, const unsigned char *sess_id,