Rename TLS extension handling to use less "hello".

When the TLS extension code was rewritten, TLS extensions could only exist
in ClientHello and ServerHello messages - as such, they were named in pairs
of *_clienthello_{needs,build} which would be called by the client and
*_clienthello_parse. Likewise for *_serverhello_{needs,build} which would
be called by a server and *_serverhello_parse, which would be called by a
client.

Enter TLSv1.3 - TLS extensions can now exist in one of seven messages,
with only certain types being allowed to appear in each, meaning the naming
scheme no longer works. Instead, rename them to indicate the caller rather
than the message type - this effectively means:

  clienthello_needs -> client_needs
  clienthello_build -> client_build
  clienthello_parse -> server_parse
  serverhello_needs -> server_needs
  serverhello_build -> server_build
  serverhello_parse -> client_parse

ok beck@ tb@

1 files changed, 75 insertions, 66 deletions

diff --git a/src/lib/libssl/ssl_tlsext.h b/src/lib/libssl/ssl_tlsext.h
index b6108ea45a..e5c1628c98 100644
--- a/src/lib/libssl/ssl_tlsext.h
+++ b/src/lib/libssl/ssl_tlsext.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_tlsext.h,v 1.14 2018/11/09 03:17:24 jsing Exp $ */
+/* $OpenBSD: ssl_tlsext.h,v 1.15 2019/01/18 00:54:42 jsing Exp $ */
 /*
  * Copyright (c) 2016, 2017 Joel Sing <jsing@openbsd.org>
  * Copyright (c) 2017 Doug Hogan <doug@openbsd.org>
@@ -19,78 +19,87 @@
 #ifndef HEADER_SSL_TLSEXT_H
 #define HEADER_SSL_TLSEXT_H
 
+/* TLSv1.3 - RFC 8446 Section 4.2. */
+#define SSL_TLSEXT_MSG_CH       0x0001  /* ClientHello */
+#define SSL_TLSEXT_MSG_SH       0x0002  /* ServerHello */
+#define SSL_TLSEXT_MSG_EE       0x0004  /* EncryptedExtension */
+#define SSL_TLSEXT_MSG_CT       0x0008  /* Certificate */
+#define SSL_TLSEXT_MSG_CR       0x0010  /* CertificateRequest */
+#define SSL_TLSEXT_MSG_NST      0x0020  /* NewSessionTicket */
+#define SSL_TLSEXT_MSG_HRR      0x0030  /* HelloRetryRequest */
+
 __BEGIN_HIDDEN_DECLS
 
-int tlsext_alpn_clienthello_needs(SSL *s);
-int tlsext_alpn_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_alpn_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_alpn_serverhello_needs(SSL *s);
-int tlsext_alpn_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_alpn_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_ri_clienthello_needs(SSL *s);
-int tlsext_ri_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_ri_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_ri_serverhello_needs(SSL *s);
-int tlsext_ri_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_ri_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_sigalgs_clienthello_needs(SSL *s);
-int tlsext_sigalgs_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_sigalgs_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_sigalgs_serverhello_needs(SSL *s);
-int tlsext_sigalgs_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_sigalgs_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_sni_clienthello_needs(SSL *s);
-int tlsext_sni_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_sni_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_sni_serverhello_needs(SSL *s);
-int tlsext_sni_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_sni_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_supportedgroups_clienthello_needs(SSL *s);
-int tlsext_supportedgroups_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_supportedgroups_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_supportedgroups_serverhello_needs(SSL *s);
-int tlsext_supportedgroups_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_supportedgroups_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_ecpf_clienthello_needs(SSL *s);
-int tlsext_ecpf_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_ecpf_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_ecpf_serverhello_needs(SSL *s);
-int tlsext_ecpf_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_ecpf_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_ocsp_clienthello_needs(SSL *s);
-int tlsext_ocsp_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_ocsp_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_ocsp_serverhello_needs(SSL *s);
-int tlsext_ocsp_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_ocsp_serverhello_parse(SSL *s, CBS *cbs, int *alert);
-
-int tlsext_sessionticket_clienthello_needs(SSL *s);
-int tlsext_sessionticket_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_sessionticket_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_sessionticket_serverhello_needs(SSL *s);
-int tlsext_sessionticket_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_sessionticket_serverhello_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_alpn_client_needs(SSL *s);
+int tlsext_alpn_client_build(SSL *s, CBB *cbb);
+int tlsext_alpn_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_alpn_server_needs(SSL *s);
+int tlsext_alpn_server_build(SSL *s, CBB *cbb);
+int tlsext_alpn_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_ri_client_needs(SSL *s);
+int tlsext_ri_client_build(SSL *s, CBB *cbb);
+int tlsext_ri_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_ri_server_needs(SSL *s);
+int tlsext_ri_server_build(SSL *s, CBB *cbb);
+int tlsext_ri_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_sigalgs_client_needs(SSL *s);
+int tlsext_sigalgs_client_build(SSL *s, CBB *cbb);
+int tlsext_sigalgs_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_sigalgs_server_needs(SSL *s);
+int tlsext_sigalgs_server_build(SSL *s, CBB *cbb);
+int tlsext_sigalgs_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_sni_client_needs(SSL *s);
+int tlsext_sni_client_build(SSL *s, CBB *cbb);
+int tlsext_sni_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_sni_server_needs(SSL *s);
+int tlsext_sni_server_build(SSL *s, CBB *cbb);
+int tlsext_sni_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_supportedgroups_client_needs(SSL *s);
+int tlsext_supportedgroups_client_build(SSL *s, CBB *cbb);
+int tlsext_supportedgroups_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_supportedgroups_server_needs(SSL *s);
+int tlsext_supportedgroups_server_build(SSL *s, CBB *cbb);
+int tlsext_supportedgroups_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_ecpf_client_needs(SSL *s);
+int tlsext_ecpf_client_build(SSL *s, CBB *cbb);
+int tlsext_ecpf_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_ecpf_server_needs(SSL *s);
+int tlsext_ecpf_server_build(SSL *s, CBB *cbb);
+int tlsext_ecpf_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_ocsp_client_needs(SSL *s);
+int tlsext_ocsp_client_build(SSL *s, CBB *cbb);
+int tlsext_ocsp_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_ocsp_server_needs(SSL *s);
+int tlsext_ocsp_server_build(SSL *s, CBB *cbb);
+int tlsext_ocsp_server_parse(SSL *s, CBS *cbs, int *alert);
+
+int tlsext_sessionticket_client_needs(SSL *s);
+int tlsext_sessionticket_client_build(SSL *s, CBB *cbb);
+int tlsext_sessionticket_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_sessionticket_server_needs(SSL *s);
+int tlsext_sessionticket_server_build(SSL *s, CBB *cbb);
+int tlsext_sessionticket_server_parse(SSL *s, CBS *cbs, int *alert);
 
 #ifndef OPENSSL_NO_SRTP
-int tlsext_srtp_clienthello_needs(SSL *s);
-int tlsext_srtp_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_srtp_clienthello_parse(SSL *s, CBS *cbs, int *alert);
-int tlsext_srtp_serverhello_needs(SSL *s);
-int tlsext_srtp_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_srtp_serverhello_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_srtp_client_needs(SSL *s);
+int tlsext_srtp_client_build(SSL *s, CBB *cbb);
+int tlsext_srtp_client_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_srtp_server_needs(SSL *s);
+int tlsext_srtp_server_build(SSL *s, CBB *cbb);
+int tlsext_srtp_server_parse(SSL *s, CBS *cbs, int *alert);
 #endif
 
-int tlsext_clienthello_build(SSL *s, CBB *cbb);
-int tlsext_clienthello_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_client_build(SSL *s, CBB *cbb, uint16_t msg_type);
+int tlsext_client_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type);
 
-int tlsext_serverhello_build(SSL *s, CBB *cbb);
-int tlsext_serverhello_parse(SSL *s, CBS *cbs, int *alert);
+int tlsext_server_build(SSL *s, CBB *cbb, uint16_t msg_type);
+int tlsext_server_parse(SSL *s, CBS *cbs, int *alert, uint16_t msg_type);
 
 __END_HIDDEN_DECLS