diff options
| author | jsing <> | 2015-09-11 18:08:21 +0000 |
|---|---|---|
| committer | jsing <> | 2015-09-11 18:08:21 +0000 |
| commit | eef886f2e086646b6180a7a6f2abb0ac1375e226 (patch) | |
| tree | 378accab3864084b0135769f8d9117e86df41845 /src/lib/libssl/s23_srvr.c | |
| parent | 60dc7040a30e94a6f4027c1a0996b127c296273c (diff) | |
| download | openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.tar.gz openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.tar.bz2 openbsd-eef886f2e086646b6180a7a6f2abb0ac1375e226.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/s23_srvr.c')
| -rw-r--r-- | src/lib/libssl/s23_srvr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c index d0699a55d7..08b416cab8 100644 --- a/src/lib/libssl/s23_srvr.c +++ b/src/lib/libssl/s23_srvr.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: s23_srvr.c,v 1.44 2015/09/11 14:47:56 jsing Exp $ */ | 1 | /* $OpenBSD: s23_srvr.c,v 1.45 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 | * |
| @@ -158,7 +158,7 @@ ssl23_accept(SSL *s) | |||
| 158 | ret = -1; | 158 | ret = -1; |
| 159 | goto end; | 159 | goto end; |
| 160 | } | 160 | } |
| 161 | if (!ssl3_init_finished_mac(s)) { | 161 | if (!tls1_init_finished_mac(s)) { |
| 162 | ret = -1; | 162 | ret = -1; |
| 163 | goto end; | 163 | goto end; |
| 164 | } | 164 | } |
| @@ -383,7 +383,7 @@ ssl23_get_client_hello(SSL *s) | |||
| 383 | if (j != n + 2) | 383 | if (j != n + 2) |
| 384 | return -1; | 384 | return -1; |
| 385 | 385 | ||
| 386 | ssl3_finish_mac(s, s->packet + 2, s->packet_length - 2); | 386 | tls1_finish_mac(s, s->packet + 2, s->packet_length - 2); |
| 387 | if (s->msg_callback) | 387 | if (s->msg_callback) |
| 388 | s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2, | 388 | s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2, |
| 389 | s->packet_length - 2, s, s->msg_callback_arg); | 389 | s->packet_length - 2, s, s->msg_callback_arg); |
