From c42e261f37ac3f2934dd92296a095be3cbe461c1 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Fri, 11 Sep 2015 18:08:21 +0000 Subject: Rename functions that moved to t1_enc.c, with a tls1_ prefix instead of a ssl3_ prefix. ok beck@ --- src/lib/libssl/s3_both.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libssl/s3_both.c') diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index cd8afd1946..49b1e50659 100644 --- a/src/lib/libssl/s3_both.c +++ b/src/lib/libssl/s3_both.c @@ -1,4 +1,4 @@ -/* $OpenBSD: s3_both.c,v 1.46 2015/09/11 16:41:05 jsing Exp $ */ +/* $OpenBSD: s3_both.c,v 1.47 2015/09/11 18:08:21 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -146,7 +146,7 @@ ssl3_do_write(SSL *s, int type) * Should not be done for 'Hello Request's, but in that case * we'll ignore the result anyway. */ - ssl3_finish_mac(s, + tls1_finish_mac(s, (unsigned char *)&s->init_buf->data[s->init_off], ret); if (ret == s->init_num) { @@ -524,7 +524,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) ssl3_take_mac(s); /* Feed this message into MAC computation. */ - ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4); + tls1_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4); if (s->msg_callback) s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, s->init_buf->data, (size_t)s->init_num + 4, s, -- cgit v1.2.3-55-g6feb