diff options
| author | Matt Caswell <matt@openssl.org> | 2016-11-25 16:28:02 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-12-08 17:18:30 +0000 |
| commit | ab83e31414286ccdc35fbacf976f64a910a6c718 (patch) | |
| tree | 8f0afe0856571ea95077a6ab40e8f5ede0161e00 /ssl/statem/statem_locl.h | |
| parent | 6dd083fd6804a3ee6ac3adc019f81910f1c63f21 (diff) | |
| download | openssl-ab83e31414286ccdc35fbacf976f64a910a6c718.zip openssl-ab83e31414286ccdc35fbacf976f64a910a6c718.tar.gz openssl-ab83e31414286ccdc35fbacf976f64a910a6c718.tar.bz2 | |
Move client construction of ClientHello extensions into new framework
Perl changes reviewed by Richard Levitte. Non-perl changes reviewed by Rich
Salz
Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/statem/statem_locl.h')
| -rw-r--r-- | ssl/statem/statem_locl.h | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/ssl/statem/statem_locl.h b/ssl/statem/statem_locl.h index 88c40f5..0ec2353 100644 --- a/ssl/statem/statem_locl.h +++ b/ssl/statem/statem_locl.h @@ -168,7 +168,9 @@ int tls_parse_client_supported_groups(SSL *s, PACKET *pkt, int *al); #endif int tls_parse_client_session_ticket(SSL *s, PACKET *pkt, int *al); int tls_parse_client_sig_algs(SSL *s, PACKET *pkt, int *al); +#ifndef OPENSSL_NO_OCSP int tls_parse_client_status_request(SSL *s, PACKET *pkt, int *al); +#endif #ifndef OPENSSL_NO_NEXTPROTONEG int tls_parse_client_npn(SSL *s, PACKET *pkt, int *al); #endif @@ -184,12 +186,20 @@ int tls_scan_clienthello_tlsext(SSL *s, CLIENTHELLO_MSG *hello, int *al); int tls_construct_server_renegotiate(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_server_name(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_EC int tls_construct_server_ec_pt_formats(SSL *s, WPACKET *pkt, int *al); +#endif int tls_construct_server_session_ticket(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_OCSP int tls_construct_server_status_request(SSL *s, WPACKET *pkt, int *al); +#endif +#ifndef OPENSSL_NO_NEXTPROTONEG int tls_construct_server_next_proto_neg(SSL *s, WPACKET *pkt, int *al); +#endif int tls_construct_server_alpn(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_SRTP int tls_construct_server_use_srtp(SSL *s, WPACKET *pkt, int *al); +#endif int tls_construct_server_etm(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_ems(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_key_share(SSL *s, WPACKET *pkt, int *al); @@ -201,13 +211,44 @@ int tls_construct_server_key_share(SSL *s, WPACKET *pkt, int *al); int tls_construct_server_cryptopro_bug(SSL *s, WPACKET *pkt, int *al); /* Client Extension processing */ +int tls_construct_client_renegotiate(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_server_name(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_SRP +int tls_construct_client_srp(SSL *s, WPACKET *pkt, int *al); +#endif +#ifndef OPENSSL_NO_EC +int tls_construct_client_ec_pt_formats(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_supported_groups(SSL *s, WPACKET *pkt, int *al); +#endif +int tls_construct_client_session_ticket(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_sig_algs(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_OCSP +int tls_construct_client_status_request(SSL *s, WPACKET *pkt, int *al); +#endif +#ifndef OPENSSL_NO_NEXTPROTONEG +int tls_construct_client_npn(SSL *s, WPACKET *pkt, int *al); +#endif +int tls_construct_client_alpn(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_SRTP +int tls_construct_client_use_srtp(SSL *s, WPACKET *pkt, int *al); +#endif +int tls_construct_client_etm(SSL *s, WPACKET *pkt, int *al); +#ifndef OPENSSL_NO_CT +int tls_construct_client_sct(SSL *s, WPACKET *pkt, int *al); +#endif +int tls_construct_client_ems(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_supported_versions(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_key_share(SSL *s, WPACKET *pkt, int *al); +int tls_construct_client_padding(SSL *s, WPACKET *pkt, int *al); int tls_parse_server_renegotiate(SSL *s, PACKET *pkt, int *al); int tls_parse_server_server_name(SSL *s, PACKET *pkt, int *al); #ifndef OPENSSL_NO_EC int tls_parse_server_ec_pt_formats(SSL *s, PACKET *pkt, int *al); #endif int tls_parse_server_session_ticket(SSL *s, PACKET *pkt, int *al); +#ifndef OPENSSL_NO_OCSP int tls_parse_server_status_request(SSL *s, PACKET *pkt, int *al); +#endif #ifndef OPENSSL_NO_CT int tls_parse_server_sct(SSL *s, PACKET *pkt, int *al); #endif |