diff options
39 files changed, 39 insertions, 39 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index e8e30561df..8ec5bcdb80 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -68,7 +68,7 @@ PSK_COBJECTS = psk.c COBJECTS = range.c record.c compress.c debug.c cipher.c gthreads.h \ mbuffers.c buffers.c handshake.c num.c errors.c dh.c kx.c \ priority.c hash_int.c cipher_int.c session.c db.c x509_b64.c \ - extensions.c auth.c sslv2_compat.c datum.c session_pack.c mpi.c \ + hello_ext.c auth.c sslv2_compat.c datum.c session_pack.c mpi.c \ pk.c cert.c global.c constate.c anon_cred.c pkix_asn1_tab.c gnutls_asn1_tab.c \ mem.c fingerprint.c tls-sig.c ecc.c alert.c privkey_raw.c atomic.h \ system/certs.c system/threads.c system/fastopen.c system/sockets.c \ @@ -101,7 +101,7 @@ HFILES = abstract_int.h debug.h cipher.h \ buffers.h errors.h gnutls_int.h dtls.h \ handshake.h num.h algorithms.h \ dh.h kx.h hash_int.h cipher_int.h \ - db.h auth.h extensions.h \ + db.h auth.h hello_ext.h \ x509_b64.h sslv2_compat.h datum.h \ mpi.h pk.h record.h \ constate.h global.h tls-sig.h mem.h \ diff --git a/lib/constate.c b/lib/constate.c index cfc30b3c39..85bc0ffcc9 100644 --- a/lib/constate.c +++ b/lib/constate.c @@ -33,7 +33,7 @@ #include <num.h> #include <datum.h> #include <state.h> -#include <extensions.h> +#include <hello_ext.h> #include <buffers.h> #include "dtls.h" diff --git a/lib/ext/alpn.h b/lib/ext/alpn.h index b04eabd1b2..0aee40f5b0 100644 --- a/lib/ext/alpn.h +++ b/lib/ext/alpn.h @@ -20,7 +20,7 @@ #ifndef EXT_ALPN_H #define EXT_ALPN_H -#include <extensions.h> +#include <hello_ext.h> #define MAX_ALPN_PROTOCOLS 8 #define MAX_ALPN_PROTOCOL_NAME 32 diff --git a/lib/ext/dumbfw.h b/lib/ext/dumbfw.h index 6ee30e9f6b..fedf33bfc1 100644 --- a/lib/ext/dumbfw.h +++ b/lib/ext/dumbfw.h @@ -20,7 +20,7 @@ #ifndef EXT_DUMBFW_H #define EXT_DUMBFW_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_dumbfw; diff --git a/lib/ext/ecc.h b/lib/ext/ecc.h index 50074843ef..106bb15a18 100644 --- a/lib/ext/ecc.h +++ b/lib/ext/ecc.h @@ -22,7 +22,7 @@ #ifndef EXT_ECC_H #define EXT_ECC_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_supported_ecc; extern const hello_ext_entry_st ext_mod_supported_ecc_pf; diff --git a/lib/ext/etm.c b/lib/ext/etm.c index dcdf9e22a1..1972411903 100644 --- a/lib/ext/etm.c +++ b/lib/ext/etm.c @@ -26,7 +26,7 @@ #include "gnutls_int.h" #include "errors.h" #include "num.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/etm.h> static int _gnutls_ext_etm_recv_params(gnutls_session_t session, diff --git a/lib/ext/etm.h b/lib/ext/etm.h index 3a14c662c7..1842948721 100644 --- a/lib/ext/etm.h +++ b/lib/ext/etm.h @@ -23,7 +23,7 @@ #ifndef EXT_ETM_H #define EXT_ETM_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_etm; diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c index 4c3c937426..16feac4ea0 100644 --- a/lib/ext/ext_master_secret.c +++ b/lib/ext/ext_master_secret.c @@ -26,7 +26,7 @@ #include "gnutls_int.h" #include "errors.h" #include "num.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/ext_master_secret.h> static int _gnutls_ext_master_secret_recv_params(gnutls_session_t session, diff --git a/lib/ext/ext_master_secret.h b/lib/ext/ext_master_secret.h index cfe4d26ff2..92c6102f03 100644 --- a/lib/ext/ext_master_secret.h +++ b/lib/ext/ext_master_secret.h @@ -23,7 +23,7 @@ #ifndef EXT_EXT_MASTER_SECRET_H #define EXT_EXT_MASTER_SECRET_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_ext_master_secret; diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c index 2e3bb9fd5e..143c096ed5 100644 --- a/lib/ext/heartbeat.c +++ b/lib/ext/heartbeat.c @@ -29,7 +29,7 @@ #include <dtls.h> #include <record.h> #include <ext/heartbeat.h> -#include <extensions.h> +#include <hello_ext.h> #include <random.h> #ifdef ENABLE_HEARTBEAT diff --git a/lib/ext/heartbeat.h b/lib/ext/heartbeat.h index f319b87b02..fec8f9e158 100644 --- a/lib/ext/heartbeat.h +++ b/lib/ext/heartbeat.h @@ -24,7 +24,7 @@ #ifndef EXT_HEARTBEAT_H #define EXT_HEARTBEAT_H -#include <extensions.h> +#include <hello_ext.h> #define HEARTBEAT_REQUEST 1 #define HEARTBEAT_RESPONSE 2 diff --git a/lib/ext/key_share.h b/lib/ext/key_share.h index 7e8fd327a6..72606fb9ba 100644 --- a/lib/ext/key_share.h +++ b/lib/ext/key_share.h @@ -23,7 +23,7 @@ #ifndef EXT_KEY_SHARE_H #define EXT_KEY_SHARE_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_key_share; diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c index 13e6dfa549..81a499e998 100644 --- a/lib/ext/max_record.c +++ b/lib/ext/max_record.c @@ -26,7 +26,7 @@ #include "gnutls_int.h" #include "errors.h" #include "num.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/max_record.h> static int _gnutls_max_record_recv_params(gnutls_session_t session, diff --git a/lib/ext/max_record.h b/lib/ext/max_record.h index cdbe6094d3..b536edebcc 100644 --- a/lib/ext/max_record.h +++ b/lib/ext/max_record.h @@ -23,7 +23,7 @@ #ifndef EXT_MAX_RECORD_H #define EXT_MAX_RECORD_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_max_record_size; diff --git a/lib/ext/post_handshake.c b/lib/ext/post_handshake.c index d4bf312397..49f00f0b09 100644 --- a/lib/ext/post_handshake.c +++ b/lib/ext/post_handshake.c @@ -26,7 +26,7 @@ #include "gnutls_int.h" #include "errors.h" #include "num.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/post_handshake.h> #include "auth/cert.h" diff --git a/lib/ext/post_handshake.h b/lib/ext/post_handshake.h index eb4872ccf4..6426a7f822 100644 --- a/lib/ext/post_handshake.h +++ b/lib/ext/post_handshake.h @@ -23,7 +23,7 @@ #ifndef EXT_POST_HANDSHAKE_H #define EXT_POST_HANDSHAKE_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_post_handshake; diff --git a/lib/ext/safe_renegotiation.h b/lib/ext/safe_renegotiation.h index e3f0a81d04..234640a88d 100644 --- a/lib/ext/safe_renegotiation.h +++ b/lib/ext/safe_renegotiation.h @@ -23,7 +23,7 @@ #ifndef EXT_SAFE_RENEGOTIATION_H #define EXT_SAFE_RENEGOTIATION_H -#include <extensions.h> +#include <hello_ext.h> typedef struct { uint8_t client_verify_data[MAX_VERIFY_DATA_SIZE]; diff --git a/lib/ext/server_name.h b/lib/ext/server_name.h index 9b6085a23d..6954e232d5 100644 --- a/lib/ext/server_name.h +++ b/lib/ext/server_name.h @@ -23,7 +23,7 @@ #ifndef EXT_SERVER_NAME_H #define EXT_SERVER_NAME_H -#include <extensions.h> +#include <hello_ext.h> typedef struct { uint8_t name[MAX_SERVER_NAME_SIZE+1]; diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c index 7a3b3bfd32..432794038c 100644 --- a/lib/ext/session_ticket.c +++ b/lib/ext/session_ticket.c @@ -31,7 +31,7 @@ #include <random.h> #include <ext/session_ticket.h> #include <mbuffers.h> -#include <extensions.h> +#include <hello_ext.h> #include <constate.h> #include <dtls.h> #include "db.h" diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h index f82565b073..c00c3f6b7e 100644 --- a/lib/ext/session_ticket.h +++ b/lib/ext/session_ticket.h @@ -23,7 +23,7 @@ #ifndef EXT_SESSION_TICKET_H #define EXT_SESSION_TICKET_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_session_ticket; diff --git a/lib/ext/signature.h b/lib/ext/signature.h index 373af2fa86..5c91d1a910 100644 --- a/lib/ext/signature.h +++ b/lib/ext/signature.h @@ -25,7 +25,7 @@ #ifndef EXT_SIGNATURE_H #define EXT_SIGNATURE_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_sig; diff --git a/lib/ext/srp.c b/lib/ext/srp.c index 756483dce7..ece6a752e1 100644 --- a/lib/ext/srp.c +++ b/lib/ext/srp.c @@ -30,7 +30,7 @@ #include "errors.h" #include "algorithms.h" #include <num.h> -#include <extensions.h> +#include <hello_ext.h> static int _gnutls_srp_unpack(gnutls_buffer_st * ps, gnutls_ext_priv_data_t * _priv); diff --git a/lib/ext/srp.h b/lib/ext/srp.h index a18efc9780..ed89857ae7 100644 --- a/lib/ext/srp.h +++ b/lib/ext/srp.h @@ -23,7 +23,7 @@ #ifndef EXT_SRP_H #define EXT_SRP_H -#include <extensions.h> +#include <hello_ext.h> #ifdef ENABLE_SRP diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h index 82482e577f..f49d7d031f 100644 --- a/lib/ext/srtp.h +++ b/lib/ext/srtp.h @@ -22,7 +22,7 @@ #ifndef EXT_SRTP_H #define EXT_SRTP_H -#include <extensions.h> +#include <hello_ext.h> #define MAX_SRTP_PROFILES 4 diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c index 3a12e9cd40..7263222e75 100644 --- a/lib/ext/status_request.c +++ b/lib/ext/status_request.c @@ -28,7 +28,7 @@ #include "gnutls_int.h" #include "errors.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/status_request.h> #include <mbuffers.h> #include <auth.h> diff --git a/lib/ext/status_request.h b/lib/ext/status_request.h index f01d54724f..6a07db75dd 100644 --- a/lib/ext/status_request.h +++ b/lib/ext/status_request.h @@ -23,7 +23,7 @@ #ifndef EXT_STATUS_REQUEST_H #define EXT_STATUS_REQUEST_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_status_request; diff --git a/lib/ext/supported_versions.c b/lib/ext/supported_versions.c index 5ffb9bb4ba..282a991ba2 100644 --- a/lib/ext/supported_versions.c +++ b/lib/ext/supported_versions.c @@ -27,7 +27,7 @@ #include "gnutls_int.h" #include "errors.h" #include "num.h" -#include <extensions.h> +#include <hello_ext.h> #include <ext/supported_versions.h> static int supported_versions_recv_params(gnutls_session_t session, diff --git a/lib/ext/supported_versions.h b/lib/ext/supported_versions.h index 7eb0abfbf2..601b424ff6 100644 --- a/lib/ext/supported_versions.h +++ b/lib/ext/supported_versions.h @@ -23,7 +23,7 @@ #ifndef EXT_SUPPORTED_VERSIONS_H #define EXT_SUPPORTED_VERSIONS_H -#include <extensions.h> +#include <hello_ext.h> extern const hello_ext_entry_st ext_mod_supported_versions; diff --git a/lib/extv.c b/lib/extv.c index d68f852769..32dbc942fe 100644 --- a/lib/extv.c +++ b/lib/extv.c @@ -21,7 +21,7 @@ */ #include "gnutls_int.h" -#include "extensions.h" +#include "hello_ext.h" #include "errors.h" #include "extv.h" diff --git a/lib/global.c b/lib/global.c index 389778e022..eaac0a5872 100644 --- a/lib/global.c +++ b/lib/global.c @@ -28,7 +28,7 @@ #include <random.h> #include <gnutls/pkcs11.h> -#include <extensions.h> /* for _gnutls_hello_ext_init */ +#include <hello_ext.h> /* for _gnutls_hello_ext_init */ #include <supplemental.h> /* for _gnutls_supplemental_deinit */ #include <locks.h> #include <system.h> diff --git a/lib/handshake.c b/lib/handshake.c index 3c1526f730..11993dc259 100644 --- a/lib/handshake.c +++ b/lib/handshake.c @@ -37,7 +37,7 @@ #include "num.h" #include "hash_int.h" #include "db.h" -#include "extensions.h" +#include "hello_ext.h" #include "supplemental.h" #include "auth.h" #include "sslv2_compat.h" diff --git a/lib/extensions.c b/lib/hello_ext.c index 340f65508e..16791da95e 100644 --- a/lib/extensions.c +++ b/lib/hello_ext.c @@ -27,7 +27,7 @@ */ #include "gnutls_int.h" -#include "extensions.h" +#include "hello_ext.h" #include "errors.h" #include "ext/max_record.h" #include <ext/server_name.h> diff --git a/lib/extensions.h b/lib/hello_ext.h index 884ce86490..884ce86490 100644 --- a/lib/extensions.h +++ b/lib/hello_ext.h diff --git a/lib/priority.c b/lib/priority.c index 207d8f06cf..6e537bd8c0 100644 --- a/lib/priority.c +++ b/lib/priority.c @@ -30,7 +30,7 @@ #include <num.h> #include <gnutls/x509.h> #include <c-ctype.h> -#include <extensions.h> +#include <hello_ext.h> #include "fips.h" #include "errno.h" #include <gnutls/gnutls.h> diff --git a/lib/session_pack.c b/lib/session_pack.c index 6153434d2b..843a4cfc6d 100644 --- a/lib/session_pack.c +++ b/lib/session_pack.c @@ -39,7 +39,7 @@ #include <session_pack.h> #include <datum.h> #include <num.h> -#include <extensions.h> +#include <hello_ext.h> #include <constate.h> #include <algorithms.h> #include <state.h> diff --git a/lib/sslv2_compat.c b/lib/sslv2_compat.c index 5ec5a0ad34..f8eff3b151 100644 --- a/lib/sslv2_compat.c +++ b/lib/sslv2_compat.c @@ -35,7 +35,7 @@ #include "num.h" #include "hash_int.h" #include "db.h" -#include "extensions.h" +#include "hello_ext.h" #include "auth.h" #include "sslv2_compat.h" #include "constate.h" diff --git a/lib/state.c b/lib/state.c index 700c633957..32829cf6a5 100644 --- a/lib/state.c +++ b/lib/state.c @@ -44,7 +44,7 @@ #include <auth/anon.h> #include <auth/psk.h> #include <algorithms.h> -#include <extensions.h> +#include <hello_ext.h> #include <system.h> #include <random.h> #include <fips.h> diff --git a/lib/x509.c b/lib/x509.c index 3eb569e0f2..1f276536dd 100644 --- a/lib/x509.c +++ b/lib/x509.c @@ -24,7 +24,7 @@ #include "gnutls_int.h" #include "auth.h" #include "errors.h" -#include "extensions.h" +#include "hello_ext.h" #include <auth/cert.h> #include "dh.h" #include "num.h" diff --git a/lib/x509/output.c b/lib/x509/output.c index e2bfc21809..b9e183d37f 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -30,7 +30,7 @@ #include <x509_int.h> #include <num.h> #include "errors.h" -#include "extensions.h" +#include "hello_ext.h" #include "ip.h" #define addf _gnutls_buffer_append_printf |