diff options
Diffstat (limited to 'src/lib/libssl/tls13_legacy.c')
-rw-r--r-- | src/lib/libssl/tls13_legacy.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libssl/tls13_legacy.c b/src/lib/libssl/tls13_legacy.c index cd9ec9942d..beb8952402 100644 --- a/src/lib/libssl/tls13_legacy.c +++ b/src/lib/libssl/tls13_legacy.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: tls13_legacy.c,v 1.25 2021/06/28 15:36:51 tb Exp $ */ | 1 | /* $OpenBSD: tls13_legacy.c,v 1.26 2021/07/01 17:53:39 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2018, 2019 Joel Sing <jsing@openbsd.org> |
4 | * | 4 | * |
@@ -358,8 +358,8 @@ tls13_use_legacy_client(struct tls13_ctx *ctx) | |||
358 | if (!tls13_use_legacy_stack(ctx)) | 358 | if (!tls13_use_legacy_stack(ctx)) |
359 | return 0; | 359 | return 0; |
360 | 360 | ||
361 | s->internal->handshake_func = s->method->internal->ssl_connect; | 361 | s->internal->handshake_func = s->method->ssl_connect; |
362 | s->client_version = s->version = s->method->internal->max_tls_version; | 362 | s->client_version = s->version = s->method->max_tls_version; |
363 | 363 | ||
364 | return 1; | 364 | return 1; |
365 | } | 365 | } |
@@ -372,8 +372,8 @@ tls13_use_legacy_server(struct tls13_ctx *ctx) | |||
372 | if (!tls13_use_legacy_stack(ctx)) | 372 | if (!tls13_use_legacy_stack(ctx)) |
373 | return 0; | 373 | return 0; |
374 | 374 | ||
375 | s->internal->handshake_func = s->method->internal->ssl_accept; | 375 | s->internal->handshake_func = s->method->ssl_accept; |
376 | s->client_version = s->version = s->method->internal->max_tls_version; | 376 | s->client_version = s->version = s->method->max_tls_version; |
377 | s->server = 1; | 377 | s->server = 1; |
378 | 378 | ||
379 | return 1; | 379 | return 1; |
@@ -405,7 +405,7 @@ tls13_legacy_accept(SSL *ssl) | |||
405 | 405 | ||
406 | ret = tls13_server_accept(ctx); | 406 | ret = tls13_server_accept(ctx); |
407 | if (ret == TLS13_IO_USE_LEGACY) | 407 | if (ret == TLS13_IO_USE_LEGACY) |
408 | return ssl->method->internal->ssl_accept(ssl); | 408 | return ssl->method->ssl_accept(ssl); |
409 | 409 | ||
410 | return tls13_legacy_return_code(ssl, ret); | 410 | return tls13_legacy_return_code(ssl, ret); |
411 | } | 411 | } |
@@ -420,7 +420,7 @@ tls13_legacy_connect(SSL *ssl) | |||
420 | /* XXX drop back to legacy for client auth for now */ | 420 | /* XXX drop back to legacy for client auth for now */ |
421 | if (ssl->cert->key->privatekey != NULL) { | 421 | if (ssl->cert->key->privatekey != NULL) { |
422 | ssl->method = tls_legacy_client_method(); | 422 | ssl->method = tls_legacy_client_method(); |
423 | return ssl->method->internal->ssl_connect(ssl); | 423 | return ssl->method->ssl_connect(ssl); |
424 | } | 424 | } |
425 | #endif | 425 | #endif |
426 | 426 | ||
@@ -444,7 +444,7 @@ tls13_legacy_connect(SSL *ssl) | |||
444 | 444 | ||
445 | ret = tls13_client_connect(ctx); | 445 | ret = tls13_client_connect(ctx); |
446 | if (ret == TLS13_IO_USE_LEGACY) | 446 | if (ret == TLS13_IO_USE_LEGACY) |
447 | return ssl->method->internal->ssl_connect(ssl); | 447 | return ssl->method->ssl_connect(ssl); |
448 | 448 | ||
449 | return tls13_legacy_return_code(ssl, ret); | 449 | return tls13_legacy_return_code(ssl, ret); |
450 | } | 450 | } |