extensions: files renamed to hello_ext

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e8e30561df983e60827d19069a9d1dd042e8d400..8ec5bcdb80758901c8b6df49df92f537712b3cbb 100644 (file)
--- 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 cfc30b3c396d1b3fc11d185eff6be8d735658588..85bc0ffcc9fab64919c68c1cc396c26e497ccdfd 100644 (file)
--- 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 b04eabd1b2aa05485c363b4bb769557eea3ef0b8..0aee40f5b0ee707abb20f87dd06ec54cc7dd48d9 100644 (file)
--- 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 6ee30e9f6b195c0f48006e41d65f2b1f74b73d47..fedf33bfc183f94f1cf06c4c16eeca228e3b330b 100644 (file)
--- 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 50074843ef324042190792b20e643c55a171513f..106bb15a1828842b33acc2492495b03718b807aa 100644 (file)
--- 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 dcdf9e22a16189462b1f026a0b6859a2408c73de..1972411903c5fefb8e3014a4d9ea5cc9885c1ebf 100644 (file)
--- 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 3a14c662c7e9e15e00e58a523f06d11b840b87ca..18429487212bb3efb5f81ea27012c4f462f20002 100644 (file)
--- 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 4c3c937426516163ad18af92ae85537cfded359f..16feac4ea0492f31d3cec442f05b67c836277dc6 100644 (file)
--- 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 cfe4d26ff21892785fc94e71620b6cd2d22451ac..92c6102f03b6a342efed84600c7733367e057ea3 100644 (file)
--- 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 2e3bb9fd5e13a4587b79e39228519930262211d5..143c096ed5c4685b2fbe6631e81c4bbd2dc21b1e 100644 (file)
--- 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 f319b87b0211bab2319dc839a644ba09f7c41bee..fec8f9e158edfb9bcc2441034915ac1d6ab78b5e 100644 (file)
--- 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 7e8fd327a6d8a433161553c506bd5cb6478f2b26..72606fb9ba4e57ec4f356f7844759003ee5450e6 100644 (file)
--- 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 13e6dfa549713d3653fceda3bc574ba7b6684165..81a499e9987cd111a78ac3c1bc70a5c620775e16 100644 (file)
--- 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 cdbe6094d3009bfb8af1fd2a0de3a3d2f1d57e9b..b536edebcc5d14af65e1809a62eebbf88d81502f 100644 (file)
--- 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 d4bf3123977c5e1515027103edc5badb67fd84e8..49f00f0b09ac53919af1939101d0b999efb1b866 100644 (file)
--- 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 eb4872ccf4816168857c722b9183a4efabd08232..6426a7f8223440548fb0d15bec88ba22bc4feb7d 100644 (file)
--- 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 e3f0a81d0471861a5b1673f7de3a54461817adcc..234640a88d59d8e217828625b732baac8242b8a7 100644 (file)
--- 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 9b6085a23d49a2dedb5e467adcb7618fa9006b96..6954e232d59aaa650046f108c6639a669349c430 100644 (file)
--- 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 7a3b3bfd32191e01cd6e2fb7025ba3f851aa12a2..432794038c9c487a20f8be5ac6f08b213d910483 100644 (file)
--- 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 f82565b07327612e429c72a52cd09c1f121329b1..c00c3f6b7e58a3beae28d1fd3fe507508d1b2875 100644 (file)
--- 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 373af2fa86f07a8ee00916d4b0c6eca06ce62dea..5c91d1a91048b842ba575a5643727c175ec2ff02 100644 (file)
--- 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 756483dce739481cbd33654b36fbb0d86ecb1f58..ece6a752e1e04016c998274260580ff1b7a1e67e 100644 (file)
--- 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 a18efc978071cb7bc69da73dc042f3aa3f3ad729..ed89857ae762606344b9119dce29c89e40c10bce 100644 (file)
--- 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 82482e577f7d269e241f9e58cc128c8a359a875b..f49d7d031f5519c0b8fbbc3afc7e7999616ef74a 100644 (file)
--- 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 3a12e9cd40c9be930e51d631d780119ac67f5314..7263222e75fd7c341df42e51bf51cd8ba050cbc2 100644 (file)
--- 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 f01d54724f5fb501551509d85f1e9dc36013924d..6a07db75dd7e8de716960c0524af2cea3a04e601 100644 (file)
--- 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 5ffb9bb4bac326439e8e549aae335a28022e63d6..282a991ba2d1cf816c90a8a73ab9567eb9fe9f5c 100644 (file)
--- 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 7eb0abfbf2aff40ee2b18906da206e25a90dd335..601b424ff6130833302ac77551b2cad08b5f0b67 100644 (file)
--- 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 d68f8527693dfc078dbba43a3ecc4e52c719e7ca..32dbc942fea6c442518f2d93d15a215d284968a9 100644 (file)
--- 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 389778e02279a9595673a6f71ffa7658fd9cdae6..eaac0a5872e21f926cfa1b8bec34f059dbd5bf9f 100644 (file)
--- 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 3c1526f7301aaf8fecdc969905ac8602d9cad1b2..11993dc259e431568ddb20582bf838f816c0da7c 100644 (file)
--- 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
similarity index 99%
rename from lib/extensions.c
rename to lib/hello_ext.c
index 340f65508ee2527563c3eb7a20a5fed253923619..16791da95e71972911d879a225e5ad108def1881 100644 (file)
--- 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
similarity index 100%
rename from lib/extensions.h
rename to lib/hello_ext.h

diff --git a/lib/priority.c b/lib/priority.c
index 207d8f06cfcf59a4c0be63f38959d93f312c021a..6e537bd8c06f4608c405d4c5dbf9a43f807be90e 100644 (file)
--- 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 6153434d2b624b963665cc4a0dcb1e86aa7f4b1f..843a4cfc6dc36a426ebce94eef506fa4a8d14d60 100644 (file)
--- 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 5ec5a0ad3457faf01f7294bb70e05f5eebc5ce6f..f8eff3b15157c5251e156e17ce8d26161ce6b157 100644 (file)
--- 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 700c633957428f948708396ef3f1b1e18f38fe29..32829cf6a5469f5775a684b609bddbed11558cc6 100644 (file)
--- 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 3eb569e0f294f4c239c7ad8013df99cf20d558f3..1f276536ddf112068fb5a3da967e60b279a8184b 100644 (file)
--- 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 e2bfc21809288330bc8e2bd63dee2bb113a6205a..b9e183d37fde8cbe045ae5db36f29acb6490940f 100644 (file)
--- 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