提交 61c32649 编写于 作者: M Matt Caswell

Remove unneccessary comments

Now we're using an enum the values themselves are self explanatory
Reviewed-by: NRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
上级 fed60a78
...@@ -480,15 +480,15 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al) ...@@ -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); r = tls_get_ticket_from_client(s, hello, &ret);
switch (r) { switch (r) {
case TICKET_FATAL_ERR_MALLOC: case TICKET_FATAL_ERR_MALLOC:
case TICKET_FATAL_ERR_OTHER: /* Error during processing */ case TICKET_FATAL_ERR_OTHER:
fatal = 1; fatal = 1;
goto err; goto err;
case TICKET_NONE: /* No ticket found */ case TICKET_NONE:
case TICKET_EMPTY: /* Zero length ticket found */ case TICKET_EMPTY:
try_session_cache = 1; try_session_cache = 1;
break; /* Ok to carry on processing session id. */ break;
case TICKET_NO_DECRYPT: /* Ticket found but not decrypted. */ case TICKET_NO_DECRYPT:
case TICKET_SUCCESS: /* Ticket decrypted, *ret has been set. */ case TICKET_SUCCESS:
case TICKET_SUCCESS_RENEW: case TICKET_SUCCESS_RENEW:
break; break;
} }
......
...@@ -1093,18 +1093,18 @@ TICKET_RETURN tls_get_ticket_from_client(SSL *s, CLIENTHELLO_MSG *hello, ...@@ -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, retv = tls_decrypt_ticket(s, PACKET_data(&ticketext->data), size,
hello->session_id, hello->session_id_len, ret); hello->session_id, hello->session_id_len, ret);
switch (retv) { switch (retv) {
case TICKET_NO_DECRYPT: /* ticket couldn't be decrypted */ case TICKET_NO_DECRYPT:
s->ext.ticket_expected = 1; s->ext.ticket_expected = 1;
return TICKET_NO_DECRYPT; return TICKET_NO_DECRYPT;
case TICKET_SUCCESS: /* ticket was decrypted */ case TICKET_SUCCESS:
return TICKET_SUCCESS; return TICKET_SUCCESS;
case TICKET_SUCCESS_RENEW: /* ticket decrypted but need to renew */ case TICKET_SUCCESS_RENEW:
s->ext.ticket_expected = 1; s->ext.ticket_expected = 1;
return TICKET_SUCCESS; return TICKET_SUCCESS;
default: /* fatal error */ default:
return TICKET_FATAL_ERR_OTHER; return TICKET_FATAL_ERR_OTHER;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册