1 files changed, 12 insertions, 12 deletions

diff --git a/src/lib/libssl/ssl_clnt.c b/src/lib/libssl/ssl_clnt.c
index e7c78b139b..f7bbca0d78 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.1 2017/01/26 05:51:54 jsing Exp $ */
+/* $OpenBSD: ssl_clnt.c,v 1.2 2017/01/26 06:32:58 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -419,12 +419,12 @@ ssl3_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;
@@ -444,8 +444,8 @@ ssl3_connect(SSL *s)
                 case SSL3_ST_CW_FINISHED_B:
                         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->s3->flags |= SSL3_FLAGS_CCS_OK;
@@ -2005,7 +2005,7 @@ ssl3_send_client_kex_rsa(SSL *s, SESS_CERT *sess_cert, CBB *cbb)
                 goto err;
 
         s->session->master_key_length =
-            s->method->internal->ssl3_enc->generate_master_secret(s,
+            tls1_generate_master_secret(s,
                 s->session->master_key, pms, sizeof(pms));
 
         ret = 1;
@@ -2060,7 +2060,7 @@ ssl3_send_client_kex_dhe(SSL *s, SESS_CERT *sess_cert, CBB *cbb)
 
         /* Generate master key from the result. */
         s->session->master_key_length =
-            s->method->internal->ssl3_enc->generate_master_secret(s,
+            tls1_generate_master_secret(s,
                 s->session->master_key, key, key_len);
 
         if (!CBB_add_u16_length_prefixed(cbb, &dh_Yc))
@@ -2135,7 +2135,7 @@ ssl3_send_client_kex_ecdhe_ecp(SSL *s, SESS_CERT *sc, CBB *cbb)
 
         /* Generate master key from the result. */
         s->session->master_key_length =
-            s->method->internal->ssl3_enc->generate_master_secret(s,
+            tls1_generate_master_secret(s,
                 s->session->master_key, key, key_len);
 
         encoded_len = EC_POINT_point2oct(group, EC_KEY_get0_public_key(ecdh),
@@ -2204,7 +2204,7 @@ ssl3_send_client_kex_ecdhe_ecx(SSL *s, SESS_CERT *sc, CBB *cbb)
 
         /* Generate master key from the result. */
         s->session->master_key_length =
-            s->method->internal->ssl3_enc->generate_master_secret(s,
+            tls1_generate_master_secret(s,
                 s->session->master_key, shared_key, X25519_KEY_LENGTH);
 
         ret = 1;
@@ -2344,7 +2344,7 @@ ssl3_send_client_kex_gost(SSL *s, SESS_CERT *sess_cert, CBB *cbb)
         }
         EVP_PKEY_CTX_free(pkey_ctx);
         s->session->master_key_length =
-            s->method->internal->ssl3_enc->generate_master_secret(s,
+            tls1_generate_master_secret(s,
                 s->session->master_key, premaster_secret, 32);
 
         ret = 1;
@@ -2441,7 +2441,7 @@ ssl3_send_client_verify(SSL *s)
                 EVP_PKEY_sign_init(pctx);
                 if (EVP_PKEY_CTX_set_signature_md(pctx, EVP_sha1()) > 0) {
                         if (!SSL_USE_SIGALGS(s))
-                                s->method->internal->ssl3_enc->cert_verify_mac(s,
+                                tls1_cert_verify_mac(s,
                                     NID_sha1, &(data[MD5_DIGEST_LENGTH]));
                 } else {
                         ERR_clear_error();
@@ -2475,7 +2475,7 @@ ssl3_send_client_verify(SSL *s)
                         if (!tls1_digest_cached_records(s))
                                 goto err;
                 } else if (pkey->type == EVP_PKEY_RSA) {
-                        s->method->internal->ssl3_enc->cert_verify_mac(
+                        tls1_cert_verify_mac(
                             s, NID_md5, &(data[0]));
                         if (RSA_sign(NID_md5_sha1, data,
                             MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH, &(p[2]),