diff options
Diffstat (limited to 'src/lib/libssl/s3_both.c')
| -rw-r--r-- | src/lib/libssl/s3_both.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/libssl/s3_both.c b/src/lib/libssl/s3_both.c index 7381286326..4dddcd232a 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.51 2017/01/22 09:02:07 jsing Exp $ */ | 1 | /* $OpenBSD: s3_both.c,v 1.52 2017/01/23 04:55:26 beck 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 | * |
| @@ -150,10 +150,10 @@ ssl3_do_write(SSL *s, int type) | |||
| 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) { |
| 153 | if (s->msg_callback) | 153 | if (s->internal->msg_callback) |
| 154 | s->msg_callback(1, s->version, type, s->init_buf->data, | 154 | s->internal->msg_callback(1, s->version, type, s->init_buf->data, |
| 155 | (size_t)(s->init_off + s->init_num), s, | 155 | (size_t)(s->init_off + s->init_num), s, |
| 156 | s->msg_callback_arg); | 156 | s->internal->msg_callback_arg); |
| 157 | return (1); | 157 | return (1); |
| 158 | } | 158 | } |
| 159 | 159 | ||
| @@ -461,10 +461,10 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 461 | s->init_num = 0; | 461 | s->init_num = 0; |
| 462 | skip_message = 1; | 462 | skip_message = 1; |
| 463 | 463 | ||
| 464 | if (s->msg_callback) | 464 | if (s->internal->msg_callback) |
| 465 | s->msg_callback(0, s->version, | 465 | s->internal->msg_callback(0, s->version, |
| 466 | SSL3_RT_HANDSHAKE, p, 4, s, | 466 | SSL3_RT_HANDSHAKE, p, 4, s, |
| 467 | s->msg_callback_arg); | 467 | s->internal->msg_callback_arg); |
| 468 | } | 468 | } |
| 469 | } | 469 | } |
| 470 | } while (skip_message); | 470 | } while (skip_message); |
| @@ -525,10 +525,10 @@ ssl3_get_message(SSL *s, int st1, int stn, int mt, long max, int *ok) | |||
| 525 | 525 | ||
| 526 | /* Feed this message into MAC computation. */ | 526 | /* Feed this message into MAC computation. */ |
| 527 | tls1_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->internal->msg_callback) |
| 529 | s->msg_callback(0, s->version, SSL3_RT_HANDSHAKE, | 529 | s->internal->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, |
| 531 | s->msg_callback_arg); | 531 | s->internal->msg_callback_arg); |
| 532 | 532 | ||
| 533 | *ok = 1; | 533 | *ok = 1; |
| 534 | return (s->init_num); | 534 | return (s->init_num); |
