Clean up tls1_change_cipher_state().

Replace flag gymnastics at call sites with separate read and write,
functions which call the common code. Condition on s->server instead of
using SSL_ST_ACCEPT, for consistency and more readable code.

ok inoguchi@ tb@

1 files changed, 3 insertions, 5 deletions

diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index 022efd8b3b..1874d22b94 100644
--- a/src/lib/libssl/ssl_clnt.c
+++ b/src/lib/libssl/ssl_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_clnt.c,v 1.95 2021/05/02 17:18:10 jsing Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.96 2021/05/02 17:46:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -474,15 +474,13 @@ ssl3_connect(SSL *s)
 
                         S3I(s)->hs.state = SSL3_ST_CW_FINISHED_A;
                         s->internal->init_num = 0;
-
                         s->session->cipher = S3I(s)->hs.cipher;
+
                         if (!tls1_setup_key_block(s)) {
                                 ret = -1;
                                 goto end;
                         }
-
-                        if (!tls1_change_cipher_state(s,
-                            SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
+                        if (!tls1_change_write_cipher_state(s)) {
                                 ret = -1;
                                 goto end;
                         }