diff options
Diffstat (limited to 'src/lib/libssl/s23_srvr.c')
-rw-r--r-- | src/lib/libssl/s23_srvr.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/lib/libssl/s23_srvr.c b/src/lib/libssl/s23_srvr.c index 88ff9bb9a8..79c2eee521 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.52 2017/01/23 04:15:28 jsing Exp $ */ | 1 | /* $OpenBSD: s23_srvr.c,v 1.53 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 | * |
@@ -129,12 +129,12 @@ ssl23_accept(SSL *s) | |||
129 | ERR_clear_error(); | 129 | ERR_clear_error(); |
130 | errno = 0; | 130 | errno = 0; |
131 | 131 | ||
132 | if (s->info_callback != NULL) | 132 | if (s->internal->info_callback != NULL) |
133 | cb = s->info_callback; | 133 | cb = s->internal->info_callback; |
134 | else if (s->ctx->internal->info_callback != NULL) | 134 | else if (s->ctx->internal->info_callback != NULL) |
135 | cb = s->ctx->internal->info_callback; | 135 | cb = s->ctx->internal->info_callback; |
136 | 136 | ||
137 | s->in_handshake++; | 137 | s->internal->in_handshake++; |
138 | if (!SSL_in_init(s) || SSL_in_before(s)) | 138 | if (!SSL_in_init(s) || SSL_in_before(s)) |
139 | SSL_clear(s); | 139 | SSL_clear(s); |
140 | 140 | ||
@@ -194,7 +194,7 @@ ssl23_accept(SSL *s) | |||
194 | } | 194 | } |
195 | 195 | ||
196 | end: | 196 | end: |
197 | s->in_handshake--; | 197 | s->internal->in_handshake--; |
198 | if (cb != NULL) | 198 | if (cb != NULL) |
199 | cb(s, SSL_CB_ACCEPT_EXIT, ret); | 199 | cb(s, SSL_CB_ACCEPT_EXIT, ret); |
200 | 200 | ||
@@ -345,9 +345,9 @@ ssl23_get_client_hello(SSL *s) | |||
345 | return -1; | 345 | return -1; |
346 | 346 | ||
347 | tls1_finish_mac(s, s->packet + 2, s->packet_length - 2); | 347 | tls1_finish_mac(s, s->packet + 2, s->packet_length - 2); |
348 | if (s->msg_callback) | 348 | if (s->internal->msg_callback) |
349 | s->msg_callback(0, SSL2_VERSION, 0, s->packet + 2, | 349 | s->internal->msg_callback(0, SSL2_VERSION, 0, s->packet + 2, |
350 | s->packet_length - 2, s, s->msg_callback_arg); | 350 | s->packet_length - 2, s, s->internal->msg_callback_arg); |
351 | 351 | ||
352 | p = s->packet; | 352 | p = s->packet; |
353 | p += 5; | 353 | p += 5; |
@@ -450,7 +450,7 @@ ssl23_get_client_hello(SSL *s) | |||
450 | s->method = TLSv1_server_method(); | 450 | s->method = TLSv1_server_method(); |
451 | else | 451 | else |
452 | goto unsupported; | 452 | goto unsupported; |
453 | s->handshake_func = s->method->ssl_accept; | 453 | s->internal->handshake_func = s->method->ssl_accept; |
454 | } else { | 454 | } else { |
455 | /* bad, very bad */ | 455 | /* bad, very bad */ |
456 | SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO, SSL_R_UNKNOWN_PROTOCOL); | 456 | SSLerr(SSL_F_SSL23_GET_CLIENT_HELLO, SSL_R_UNKNOWN_PROTOCOL); |