diff options
| -rw-r--r-- | ssl/ssl_sess.c | 12 | ||||
| -rw-r--r-- | ssl/t1_lib.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 686d18a384..b5bb427a83 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -480,15 +480,15 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al) r = tls_get_ticket_from_client(s, hello, &ret); switch (r) { case TICKET_FATAL_ERR_MALLOC: - case TICKET_FATAL_ERR_OTHER: /* Error during processing */ + case TICKET_FATAL_ERR_OTHER: fatal = 1; goto err; - case TICKET_NONE: /* No ticket found */ - case TICKET_EMPTY: /* Zero length ticket found */ + case TICKET_NONE: + case TICKET_EMPTY: try_session_cache = 1; - break; /* Ok to carry on processing session id. */ - case TICKET_NO_DECRYPT: /* Ticket found but not decrypted. */ - case TICKET_SUCCESS: /* Ticket decrypted, *ret has been set. */ + break; + case TICKET_NO_DECRYPT: + case TICKET_SUCCESS: case TICKET_SUCCESS_RENEW: break; } diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index ffde4eeec3..35af6338d4 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1093,18 +1093,18 @@ TICKET_RETURN tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello, retv = tls_decrypt_ticket(s, PACKET_data(&ticketext->data), size, hello->session_id, hello->session_id_len, ret); switch (retv) { - case TICKET_NO_DECRYPT: /* ticket couldn't be decrypted */ + case TICKET_NO_DECRYPT: s->ext.ticket_expected = 1; return TICKET_NO_DECRYPT; - case TICKET_SUCCESS: /* ticket was decrypted */ + case TICKET_SUCCESS: return TICKET_SUCCESS; - case TICKET_SUCCESS_RENEW: /* ticket decrypted but need to renew */ + case TICKET_SUCCESS_RENEW: s->ext.ticket_expected = 1; return TICKET_SUCCESS; - default: /* fatal error */ + default: return TICKET_FATAL_ERR_OTHER; } } |