Rename STATEM to OSSL_STATEM

[openssl.git] / ssl / statem / statem.c

diff --git a/ssl/statem/statem.c b/ssl/statem/statem.c
index 6ff60eaccd981b448966762d2311af2982c228c4..062329fc00c48fede03a7fc709d0638bdd4532a6 100644 (file)
--- a/ssl/statem/statem.c
+++ b/ssl/statem/statem.c
@@ -110,20 +110,11 @@ static enum SUB_STATE_RETURN read_state_machine(SSL *s);
 static void init_write_state_machine(SSL *s);
 static enum SUB_STATE_RETURN write_state_machine(SSL *s);
 
 static void init_write_state_machine(SSL *s);
 static enum SUB_STATE_RETURN write_state_machine(SSL *s);
 

-OSSL_HANDSHAKE_STATE SSL_state(const SSL *ssl)
+OSSL_HANDSHAKE_STATE SSL_get_state(const SSL *ssl)

 {
     return ssl->statem.hand_state;
 }
 
 {
     return ssl->statem.hand_state;
 }
 

-void SSL_set_state(SSL *ssl, OSSL_HANDSHAKE_STATE state)
-{
-    /*
-     * This function seems like a really bad idea. Should we remove it
-     * completely?
-     */
-    ssl->statem.hand_state = state;
-}
-

 int SSL_in_init(SSL *s)
 {
     return s->statem.in_init;
 int SSL_in_init(SSL *s)
 {
     return s->statem.in_init;


@@ -155,6 +146,7 @@ void ossl_statem_clear(SSL *s)
     s->statem.state = MSG_FLOW_UNINITED;
     s->statem.hand_state = TLS_ST_BEFORE;
     s->statem.in_init = 1;
     s->statem.state = MSG_FLOW_UNINITED;
     s->statem.hand_state = TLS_ST_BEFORE;
     s->statem.in_init = 1;

+    s->statem.no_cert_verify = 0;

 }
 
 /*
 }
 
 /*


@@ -236,7 +228,7 @@ static int state_machine(SSL *s, int server) {
     BUF_MEM *buf = NULL;
     unsigned long Time = (unsigned long)time(NULL);
     void (*cb) (const SSL *ssl, int type, int val) = NULL;
     BUF_MEM *buf = NULL;
     unsigned long Time = (unsigned long)time(NULL);
     void (*cb) (const SSL *ssl, int type, int val) = NULL;

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

     int ret = -1;
     int ssret;
 
     int ret = -1;
     int ssret;
 


@@ -462,7 +454,7 @@ static int state_machine(SSL *s, int server) {
  */
 static void init_read_state_machine(SSL *s)
 {
  */
 static void init_read_state_machine(SSL *s)
 {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

 
     st->read_state = READ_STATE_HEADER;
 }
 
     st->read_state = READ_STATE_HEADER;
 }


@@ -494,7 +486,7 @@ static void init_read_state_machine(SSL *s)
  * will resume in the same state where we left off.
  */
 static enum SUB_STATE_RETURN read_state_machine(SSL *s) {
  * will resume in the same state where we left off.
  */
 static enum SUB_STATE_RETURN read_state_machine(SSL *s) {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

     int ret, mt;
     unsigned long len;
     int (*transition)(SSL *s, int mt);
     int ret, mt;
     unsigned long len;
     int (*transition)(SSL *s, int mt);


@@ -640,7 +632,7 @@ static enum SUB_STATE_RETURN read_state_machine(SSL *s) {
  */
 static int statem_do_write(SSL *s)
 {
  */
 static int statem_do_write(SSL *s)
 {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

 
     if (st->hand_state == TLS_ST_CW_CHANGE
             || st->hand_state == TLS_ST_SW_CHANGE) {
 
     if (st->hand_state == TLS_ST_CW_CHANGE
             || st->hand_state == TLS_ST_SW_CHANGE) {


@@ -658,7 +650,7 @@ static int statem_do_write(SSL *s)
  */
 static void init_write_state_machine(SSL *s)
 {
  */
 static void init_write_state_machine(SSL *s)
 {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

 
     st->write_state = WRITE_STATE_TRANSITION;
 }
 
     st->write_state = WRITE_STATE_TRANSITION;
 }


@@ -696,7 +688,7 @@ static void init_write_state_machine(SSL *s)
  */
 static enum SUB_STATE_RETURN write_state_machine(SSL *s)
 {
  */
 static enum SUB_STATE_RETURN write_state_machine(SSL *s)
 {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

     int ret;
     enum WRITE_TRAN (*transition)(SSL *s);
     enum WORK_STATE (*pre_work)(SSL *s, enum WORK_STATE wst);
     int ret;
     enum WRITE_TRAN (*transition)(SSL *s);
     enum WORK_STATE (*pre_work)(SSL *s, enum WORK_STATE wst);


@@ -819,7 +811,7 @@ int statem_flush(SSL *s)
  */
 int ossl_statem_app_data_allowed(SSL *s)
 {
  */
 int ossl_statem_app_data_allowed(SSL *s)
 {

-    STATEM *st = &s->statem;
+    OSSL_STATEM *st = &s->statem;

 
     if (st->state == MSG_FLOW_UNINITED || st->state == MSG_FLOW_RENEGOTIATE)
         return 0;
 
     if (st->state == MSG_FLOW_UNINITED || st->state == MSG_FLOW_RENEGOTIATE)
         return 0;