diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/ssl_tlsext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c index 3502e5a721..15a2dbd42e 100644 --- a/src/lib/libssl/ssl_tlsext.c +++ b/src/lib/libssl/ssl_tlsext.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssl_tlsext.c,v 1.41 2019/02/03 14:09:58 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_tlsext.c,v 1.42 2019/03/17 15:16:39 jsing Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2016, 2017, 2019 Joel Sing <jsing@openbsd.org> |
| 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> | 4 | * Copyright (c) 2017 Doug Hogan <doug@openbsd.org> |
| @@ -525,7 +525,7 @@ tlsext_ri_client_parse(SSL *s, CBS *cbs, int *alert) | |||
| 525 | int | 525 | int |
| 526 | tlsext_sigalgs_client_needs(SSL *s) | 526 | tlsext_sigalgs_client_needs(SSL *s) |
| 527 | { | 527 | { |
| 528 | return (TLS1_get_client_version(s) >= TLS1_2_VERSION); | 528 | return (s->client_version >= TLS1_2_VERSION); |
| 529 | } | 529 | } |
| 530 | 530 | ||
| 531 | int | 531 | int |
| @@ -535,7 +535,7 @@ tlsext_sigalgs_client_build(SSL *s, CBB *cbb) | |||
| 535 | size_t tls_sigalgs_len = tls12_sigalgs_len; | 535 | size_t tls_sigalgs_len = tls12_sigalgs_len; |
| 536 | CBB sigalgs; | 536 | CBB sigalgs; |
| 537 | 537 | ||
| 538 | if (TLS1_get_client_version(s) >= TLS1_3_VERSION && | 538 | if (s->client_version >= TLS1_3_VERSION && |
| 539 | S3I(s)->hs_tls13.min_version >= TLS1_3_VERSION) { | 539 | S3I(s)->hs_tls13.min_version >= TLS1_3_VERSION) { |
| 540 | tls_sigalgs = tls13_sigalgs; | 540 | tls_sigalgs = tls13_sigalgs; |
| 541 | tls_sigalgs_len = tls13_sigalgs_len; | 541 | tls_sigalgs_len = tls13_sigalgs_len; |
| @@ -1892,7 +1892,7 @@ tlsext_build(SSL *s, CBB *cbb, int is_server, uint16_t msg_type) | |||
| 1892 | if (is_server) | 1892 | if (is_server) |
| 1893 | version = s->version; | 1893 | version = s->version; |
| 1894 | else | 1894 | else |
| 1895 | version = TLS1_get_client_version(s); | 1895 | version = s->client_version; |
| 1896 | 1896 | ||
| 1897 | if (!CBB_add_u16_length_prefixed(cbb, &extensions)) | 1897 | if (!CBB_add_u16_length_prefixed(cbb, &extensions)) |
| 1898 | return 0; | 1898 | return 0; |
| @@ -1944,7 +1944,7 @@ tlsext_parse(SSL *s, CBS *cbs, int *alert, int is_server, uint16_t msg_type) | |||
| 1944 | if (is_server) | 1944 | if (is_server) |
| 1945 | version = s->version; | 1945 | version = s->version; |
| 1946 | else | 1946 | else |
| 1947 | version = TLS1_get_client_version(s); | 1947 | version = s->client_version; |
| 1948 | 1948 | ||
| 1949 | /* An empty extensions block is valid. */ | 1949 | /* An empty extensions block is valid. */ |
| 1950 | if (CBS_len(cbs) == 0) | 1950 | if (CBS_len(cbs) == 0) |
