From 190f375342fe35816611a439d14321f5eea5f45c Mon Sep 17 00:00:00 2001 From: jsing <> Date: Tue, 28 May 2019 17:16:42 +0000 Subject: Tidy up some names/structures following the renaming of TLS extension functions based on message type (clienthello/serverhello), to which side is handling the processing. No intended functional change. ok beck@ --- src/lib/libssl/ssl_tlsext.c | 70 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/lib/libssl/ssl_tlsext.c b/src/lib/libssl/ssl_tlsext.c index 62b8251ec4..8e9f734bf5 100644 --- a/src/lib/libssl/ssl_tlsext.c +++ b/src/lib/libssl/ssl_tlsext.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_tlsext.c,v 1.45 2019/05/08 23:49:45 tb Exp $ */ +/* $OpenBSD: ssl_tlsext.c,v 1.46 2019/05/28 17:16:42 jsing Exp $ */ /* * Copyright (c) 2016, 2017, 2019 Joel Sing * Copyright (c) 2017 Doug Hogan @@ -1669,12 +1669,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_versions_client_needs, .build = tlsext_versions_client_build, - .parse = tlsext_versions_server_parse, + .parse = tlsext_versions_client_parse, }, .server = { .needs = tlsext_versions_server_needs, .build = tlsext_versions_server_build, - .parse = tlsext_versions_client_parse, + .parse = tlsext_versions_server_parse, }, }, { @@ -1684,12 +1684,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_keyshare_client_needs, .build = tlsext_keyshare_client_build, - .parse = tlsext_keyshare_server_parse, + .parse = tlsext_keyshare_client_parse, }, .server = { .needs = tlsext_keyshare_server_needs, .build = tlsext_keyshare_server_build, - .parse = tlsext_keyshare_client_parse, + .parse = tlsext_keyshare_server_parse, }, }, { @@ -1698,12 +1698,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_sni_client_needs, .build = tlsext_sni_client_build, - .parse = tlsext_sni_server_parse, + .parse = tlsext_sni_client_parse, }, .server = { .needs = tlsext_sni_server_needs, .build = tlsext_sni_server_build, - .parse = tlsext_sni_client_parse, + .parse = tlsext_sni_server_parse, }, }, { @@ -1712,12 +1712,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_ri_client_needs, .build = tlsext_ri_client_build, - .parse = tlsext_ri_server_parse, + .parse = tlsext_ri_client_parse, }, .server = { .needs = tlsext_ri_server_needs, .build = tlsext_ri_server_build, - .parse = tlsext_ri_client_parse, + .parse = tlsext_ri_server_parse, }, }, { @@ -1727,12 +1727,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_ocsp_client_needs, .build = tlsext_ocsp_client_build, - .parse = tlsext_ocsp_server_parse, + .parse = tlsext_ocsp_client_parse, }, .server = { .needs = tlsext_ocsp_server_needs, .build = tlsext_ocsp_server_build, - .parse = tlsext_ocsp_client_parse, + .parse = tlsext_ocsp_server_parse, }, }, { @@ -1741,12 +1741,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_ecpf_client_needs, .build = tlsext_ecpf_client_build, - .parse = tlsext_ecpf_server_parse, + .parse = tlsext_ecpf_client_parse, }, .server = { .needs = tlsext_ecpf_server_needs, .build = tlsext_ecpf_server_build, - .parse = tlsext_ecpf_client_parse, + .parse = tlsext_ecpf_server_parse, }, }, { @@ -1755,12 +1755,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_supportedgroups_client_needs, .build = tlsext_supportedgroups_client_build, - .parse = tlsext_supportedgroups_server_parse, + .parse = tlsext_supportedgroups_client_parse, }, .server = { .needs = tlsext_supportedgroups_server_needs, .build = tlsext_supportedgroups_server_build, - .parse = tlsext_supportedgroups_client_parse, + .parse = tlsext_supportedgroups_server_parse, }, }, { @@ -1769,12 +1769,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_sessionticket_client_needs, .build = tlsext_sessionticket_client_build, - .parse = tlsext_sessionticket_server_parse, + .parse = tlsext_sessionticket_client_parse, }, .server = { .needs = tlsext_sessionticket_server_needs, .build = tlsext_sessionticket_server_build, - .parse = tlsext_sessionticket_client_parse, + .parse = tlsext_sessionticket_server_parse, }, }, { @@ -1783,12 +1783,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_sigalgs_client_needs, .build = tlsext_sigalgs_client_build, - .parse = tlsext_sigalgs_server_parse, + .parse = tlsext_sigalgs_client_parse, }, .server = { .needs = tlsext_sigalgs_server_needs, .build = tlsext_sigalgs_server_build, - .parse = tlsext_sigalgs_client_parse, + .parse = tlsext_sigalgs_server_parse, }, }, { @@ -1797,12 +1797,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_alpn_client_needs, .build = tlsext_alpn_client_build, - .parse = tlsext_alpn_server_parse, + .parse = tlsext_alpn_client_parse, }, .server = { .needs = tlsext_alpn_server_needs, .build = tlsext_alpn_server_build, - .parse = tlsext_alpn_client_parse, + .parse = tlsext_alpn_server_parse, }, }, { @@ -1811,12 +1811,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_cookie_client_needs, .build = tlsext_cookie_client_build, - .parse = tlsext_cookie_server_parse, + .parse = tlsext_cookie_client_parse, }, .server = { .needs = tlsext_cookie_server_needs, .build = tlsext_cookie_server_build, - .parse = tlsext_cookie_client_parse, + .parse = tlsext_cookie_server_parse, }, }, #ifndef OPENSSL_NO_SRTP @@ -1827,12 +1827,12 @@ static struct tls_extension tls_extensions[] = { .client = { .needs = tlsext_srtp_client_needs, .build = tlsext_srtp_client_build, - .parse = tlsext_srtp_server_parse, + .parse = tlsext_srtp_client_parse, }, .server = { .needs = tlsext_srtp_server_needs, .build = tlsext_srtp_server_build, - .parse = tlsext_srtp_client_parse, + .parse = tlsext_srtp_server_parse, }, } #endif /* OPENSSL_NO_SRTP */ @@ -1993,7 +1993,7 @@ tlsext_parse(SSL *s, CBS *cbs, int *alert, int is_server, uint16_t msg_type) } static void -tlsext_client_reset_state(SSL *s) +tlsext_server_reset_state(SSL *s) { s->internal->servername_done = 0; s->tlsext_status_type = -1; @@ -2004,22 +2004,22 @@ tlsext_client_reset_state(SSL *s) } int -tlsext_client_build(SSL *s, CBB *cbb, uint16_t msg_type) +tlsext_server_build(SSL *s, CBB *cbb, uint16_t msg_type) { - return tlsext_build(s, cbb, 0, msg_type); + return tlsext_build(s, cbb, 1, msg_type); } int tlsext_server_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type) { /* XXX - this possibly should be done by the caller... */ - tlsext_client_reset_state(s); + tlsext_server_reset_state(s); - return tlsext_parse(s, cbs, alert, 0, msg_type); + return tlsext_parse(s, cbs, alert, 1, msg_type); } static void -tlsext_server_reset_state(SSL *s) +tlsext_client_reset_state(SSL *s) { S3I(s)->renegotiate_seen = 0; free(S3I(s)->alpn_selected); @@ -2027,16 +2027,16 @@ tlsext_server_reset_state(SSL *s) } int -tlsext_server_build(SSL *s, CBB *cbb, uint16_t msg_type) +tlsext_client_build(SSL *s, CBB *cbb, uint16_t msg_type) { - return tlsext_build(s, cbb, 1, msg_type); + return tlsext_build(s, cbb, 0, msg_type); } int tlsext_client_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type) { /* XXX - this possibly should be done by the caller... */ - tlsext_server_reset_state(s); + tlsext_client_reset_state(s); - return tlsext_parse(s, cbs, alert, 1, msg_type); + return tlsext_parse(s, cbs, alert, 0, msg_type); } -- cgit v1.2.3-55-g6feb