summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-09-10 09:11:41 +0100
committerMatt Caswell <matt@openssl.org>2015-10-30 08:38:18 +0000
commitc64359db8af1bf759f4496a01c93bac658decc7e (patch)
treefdb40f911aa60bf46a51ec167c2c690394bc72ff /ssl
parent49ae742398aecd81551d59f421e4116a5b8a4ea9 (diff)
Redefine old state values
ssl.h and ssl3.h have a number of defines for the various states in the old state machine code. Since this is public API it is not desirable to just remove them. Instead redefine them to the closest equivalent state in the new state machine code. If an application calls SSL_state then the return value can still be compared against these old values if necessary. However not all values have an equivalent state in the new code, so these are just redefined to a dummy value. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl')
-rw-r--r--ssl/statem.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/statem.c b/ssl/statem.c
index e30eda9844..34d55cb11b 100644
--- a/ssl/statem.c
+++ b/ssl/statem.c
@@ -184,6 +184,7 @@ void statem_clear(SSL *s)
void statem_set_renegotiate(SSL *s)
{
s->statem.state = MSG_FLOW_RENEGOTIATE;
+ s->statem.in_init = 1;
}
/*