generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change SUB_STATE_RETURN into a typedef

Browse Source 
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Matt Caswell 2015-10-05 11:03:27 +01:00
parent d6f1a6e931
commit d78052cf4f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssl/statem/statem.c
View File

@ -95,20 +95,20 @@
*/ */
/* Sub state machine return values */ /* Sub state machine return values */
enum SUB_STATE_RETURN { typedef enum {
/* Something bad happened or NBIO */ /* Something bad happened or NBIO */
SUB_STATE_ERROR, SUB_STATE_ERROR,
/* Sub state finished go to the next sub state */ /* Sub state finished go to the next sub state */
SUB_STATE_FINISHED, SUB_STATE_FINISHED,
/* Sub state finished and handshake was completed */ /* Sub state finished and handshake was completed */
SUB_STATE_END_HANDSHAKE SUB_STATE_END_HANDSHAKE
}; } SUB_STATE_RETURN;
static int state_machine(SSL *s, int server); static int state_machine(SSL *s, int server);
static void init_read_state_machine(SSL *s); static void init_read_state_machine(SSL *s);
static enum SUB_STATE_RETURN read_state_machine(SSL *s); static SUB_STATE_RETURN read_state_machine(SSL *s);
static void init_write_state_machine(SSL *s); static void init_write_state_machine(SSL *s);
static enum SUB_STATE_RETURN write_state_machine(SSL *s); static SUB_STATE_RETURN write_state_machine(SSL *s);
OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl) OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl)
{ {
@ -485,7 +485,7 @@ static void init_read_state_machine(SSL *s)
* control returns to the calling application. When this function is recalled we * control returns to the calling application. When this function is recalled we
* will resume in the same state where we left off. * will resume in the same state where we left off.
*/ */
static enum SUB_STATE_RETURN read_state_machine(SSL *s) { static SUB_STATE_RETURN read_state_machine(SSL *s) {
OSSL_STATEM *st = &s->statem; OSSL_STATEM *st = &s->statem;
int ret, mt; int ret, mt;
unsigned long len; unsigned long len;
@ -686,7 +686,7 @@ static void init_write_state_machine(SSL *s)
* message has been completed. As for WRITE_STATE_PRE_WORK this could also * message has been completed. As for WRITE_STATE_PRE_WORK this could also
* result in an NBIO event. * result in an NBIO event.
*/ */
static enum SUB_STATE_RETURN write_state_machine(SSL *s) static SUB_STATE_RETURN write_state_machine(SSL *s)
{ {
OSSL_STATEM *st = &s->statem; OSSL_STATEM *st = &s->statem;
int ret; int ret;