diff options
author | jsing <> | 2015-09-11 18:08:21 +0000 |
---|---|---|
committer | jsing <> | 2015-09-11 18:08:21 +0000 |
commit | c42e261f37ac3f2934dd92296a095be3cbe461c1 (patch) | |
tree | 378accab3864084b0135769f8d9117e86df41845 /src/lib/libssl/s3_both.c | |
parent | 63eec788b454a03bda0826cf41f02edb6771089c (diff) | |
download | openbsd-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_both.c')
-rw-r--r-- | src/lib/libssl/s3_both.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 @@ | |||
1 | /* $OpenBSD: s3_both.c,v 1.46 2015/09/11 16:41:05 jsing Exp $ */ | 1 | /* $OpenBSD: s3_both.c,v 1.47 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 | * |
@@ -146,7 +146,7 @@ ssl3_do_write(SSL *s, int type) | |||
146 | * Should not be done for 'Hello Request's, but in that case | 146 | * Should not be done for 'Hello Request's, but in that case |
147 | * we'll ignore the result anyway. | 147 | * we'll ignore the result anyway. |
148 | */ | 148 | */ |
149 | ssl3_finish_mac(s, | 149 | tls1_finish_mac(s, |
150 | (unsigned char *)&s->init_buf->data[s->init_off], ret); | 150 | (unsigned char *)&s->init_buf->data[s->init_off], ret); |
151 | 151 | ||
152 | if (ret == s->init_num) { | 152 | if (ret == s->init_num) { |
@@ -524,7 +524,7 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
524 | ssl3_take_mac(s); | 524 | ssl3_take_mac(s); |
525 | 525 | ||
526 | /* Feed this message into MAC computation. */ | 526 | /* Feed this message into MAC computation. */ |
527 | ssl3_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4); | 527 | tls1_finish_mac(s, (unsigned char *)s->init_buf->data, s->init_num + 4); |
528 | if (s->msg_callback) | 528 | if (s->msg_callback) |
529 | s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, | 529 | s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, |
530 | s->init_buf->data, (size_t)s->init_num + 4, s, | 530 | s->init_buf->data, (size_t)s->init_num + 4, s, |