summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_clnt.c
diff options
context:
space:
mode:
authorjsing <>2015-09-11 18:08:21 +0000
committerjsing <>2015-09-11 18:08:21 +0000
commitc42e261f37ac3f2934dd92296a095be3cbe461c1 (patch)
tree378accab3864084b0135769f8d9117e86df41845 /src/lib/libssl/s3_clnt.c
parent63eec788b454a03bda0826cf41f02edb6771089c (diff)
downloadopenbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.tar.gz
openbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.tar.bz2
openbsd-c42e261f37ac3f2934dd92296a095be3cbe461c1.zip
Rename functions that moved to t1_enc.c, with a tls1_ prefix instead of a
ssl3_ prefix. ok beck@
Diffstat (limited to 'src/lib/libssl/s3_clnt.c')
-rw-r--r--src/lib/libssl/s3_clnt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libssl/s3_clnt.c b/src/lib/libssl/s3_clnt.c
index e4ce8163ac..eed359450f 100644
--- a/src/lib/libssl/s3_clnt.c
+++ b/src/lib/libssl/s3_clnt.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_clnt.c,v 1.126 2015/09/10 15:56:26 jsing Exp $ */ 1/* $OpenBSD: s3_clnt.c,v 1.127 2015/09/11 18:08:21 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -234,7 +234,7 @@ ssl3_connect(SSL *s)
234 234
235 /* don't push the buffering BIO quite yet */ 235 /* don't push the buffering BIO quite yet */
236 236
237 if (!ssl3_init_finished_mac(s)) { 237 if (!tls1_init_finished_mac(s)) {
238 ret = -1; 238 ret = -1;
239 goto end; 239 goto end;
240 } 240 }
@@ -517,7 +517,7 @@ ssl3_connect(SSL *s)
517 517
518 case SSL_ST_OK: 518 case SSL_ST_OK:
519 /* clean a few things up */ 519 /* clean a few things up */
520 ssl3_cleanup_key_block(s); 520 tls1_cleanup_key_block(s);
521 521
522 if (s->init_buf != NULL) { 522 if (s->init_buf != NULL) {
523 BUF_MEM_free(s->init_buf); 523 BUF_MEM_free(s->init_buf);
@@ -885,7 +885,7 @@ ssl3_get_server_hello(SSL *s)
885 */ 885 */
886 alg_k = s->s3->tmp.new_cipher->algorithm_mkey; 886 alg_k = s->s3->tmp.new_cipher->algorithm_mkey;
887 if (!(SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) && 887 if (!(SSL_USE_SIGALGS(s) || (alg_k & SSL_kGOST)) &&
888 !ssl3_digest_cached_records(s)) { 888 !tls1_digest_cached_records(s)) {
889 al = SSL_AD_INTERNAL_ERROR; 889 al = SSL_AD_INTERNAL_ERROR;
890 goto f_err; 890 goto f_err;
891 } 891 }
@@ -1524,7 +1524,7 @@ ssl3_get_certificate_request(SSL *s)
1524 * as we wont be doing client auth. 1524 * as we wont be doing client auth.
1525 */ 1525 */
1526 if (s->s3->handshake_buffer) { 1526 if (s->s3->handshake_buffer) {
1527 if (!ssl3_digest_cached_records(s)) 1527 if (!tls1_digest_cached_records(s))
1528 goto err; 1528 goto err;
1529 } 1529 }
1530 return (1); 1530 return (1);
@@ -2309,7 +2309,7 @@ ssl3_send_client_verify(SSL *s)
2309 } 2309 }
2310 s2n(u, p); 2310 s2n(u, p);
2311 n = u + 4; 2311 n = u + 4;
2312 if (!ssl3_digest_cached_records(s)) 2312 if (!tls1_digest_cached_records(s))
2313 goto err; 2313 goto err;
2314 } else if (pkey->type == EVP_PKEY_RSA) { 2314 } else if (pkey->type == EVP_PKEY_RSA) {
2315 s->method->ssl3_enc->cert_verify_mac( 2315 s->method->ssl3_enc->cert_verify_mac(
@@ -2381,7 +2381,7 @@ ssl3_send_client_verify(SSL *s)
2381 ERR_R_EVP_LIB); 2381 ERR_R_EVP_LIB);
2382 goto err; 2382 goto err;
2383 } 2383 }
2384 if (!ssl3_digest_cached_records(s)) 2384 if (!tls1_digest_cached_records(s))
2385 goto err; 2385 goto err;
2386 j = sigsize; 2386 j = sigsize;
2387 s2n(j, p); 2387 s2n(j, p);