Remove most of SSL3_ENC_METHOD - we can just inline the function calls

and defines since they are the same everywhere.

ok beck@

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/libssl/d1_clnt.c b/src/lib/libssl/d1_clnt.c
index 5f8b56ebed..c0f90dce6f 100644
--- a/src/lib/libssl/d1_clnt.c
+++ b/src/lib/libssl/d1_clnt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: d1_clnt.c,v 1.70 2017/01/26 05:31:25 jsing Exp $ */
+/* $OpenBSD: d1_clnt.c,v 1.71 2017/01/26 06:32:58 jsing Exp $ */
 /*
  * DTLS implementation written by Nagendra Modadugu
  * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
@@ -437,12 +437,12 @@ dtls1_connect(SSL *s)
                         s->internal->init_num = 0;
 
                         s->session->cipher = S3I(s)->tmp.new_cipher;
-                        if (!s->method->internal->ssl3_enc->setup_key_block(s)) {
+                        if (!tls1_setup_key_block(s)) {
                                 ret = -1;
                                 goto end;
                         }
 
-                        if (!s->method->internal->ssl3_enc->change_cipher_state(s,
+                        if (!tls1_change_cipher_state(s,
                             SSL3_CHANGE_CIPHER_CLIENT_WRITE)) {
                                 ret = -1;
                                 goto end;
@@ -458,8 +458,8 @@ dtls1_connect(SSL *s)
                                 dtls1_start_timer(s);
                         ret = ssl3_send_finished(s,
                             SSL3_ST_CW_FINISHED_A, SSL3_ST_CW_FINISHED_B,
-                            s->method->internal->ssl3_enc->client_finished_label,
-                            s->method->internal->ssl3_enc->client_finished_label_len);
+                            TLS_MD_CLIENT_FINISH_CONST,
+                            TLS_MD_CLIENT_FINISH_CONST_SIZE);
                         if (ret <= 0)
                                 goto end;
                         s->internal->state = SSL3_ST_CW_FLUSH;