Removed the 'gnutls_' prefix from files to simplify file naming

22 files changed, 137 insertions, 139 deletions

diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index 319d3700e6..af8c266383 100644
--- a/lib/auth/Makefile.am
+++ b/lib/auth/Makefile.am
@@ -35,7 +35,7 @@ endif
 noinst_LTLIBRARIES = libgnutls_auth.la
 
 libgnutls_auth_la_SOURCES = anon.c cert.c dh_common.c dhe.c \
-	rsa_psk.c dhe_psk.c psk.c psk_passwd.c rsa.c srp.c \
+	rsa_psk.c dhe_psk.c psk.c psk_passwd.c rsa.c srp_kx.c \
 	srp_passwd.c srp_rsa.c srp_sb64.c anon.h cert.h dh_common.h \
-	psk.h psk_passwd.h srp.h srp_passwd.h anon_ecdh.c \
+	psk.h psk_passwd.h srp_kx.h srp_passwd.h anon_ecdh.c \
 	ecdhe.c ecdhe.h rsa_common.h
diff --git a/lib/auth/anon.c b/lib/auth/anon.c
index f72c712e3c..24cfd74f0d 100644
--- a/lib/auth/anon.c
+++ b/lib/auth/anon.c
@@ -25,17 +25,17 @@
  * handshake.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #if defined(ENABLE_ANON) && defined(ENABLE_DHE)
 
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
 #include "auth/anon.h"
-#include "gnutls_num.h"
-#include "gnutls_mpi.h"
-#include <gnutls_state.h>
+#include "num.h"
+#include "mpi.h"
+#include <state.h>
 #include <auth/dh_common.h>
 
 static int gen_anon_server_kx(gnutls_session_t, gnutls_buffer_st *);
diff --git a/lib/auth/anon.h b/lib/auth/anon.h
index 6424fdd9a7..eb88e86144 100644
--- a/lib/auth/anon.h
+++ b/lib/auth/anon.h
@@ -21,7 +21,7 @@
  */
 
 /* this is not to be included by gnutls_anon.c */
-#include <gnutls_auth.h>
+#include <auth.h>
 #include <auth/dh_common.h>
 
 typedef struct gnutls_anon_server_credentials_st {
diff --git a/lib/auth/anon_ecdh.c b/lib/auth/anon_ecdh.c
index e171da84b5..1f8a9b7a2b 100644
--- a/lib/auth/anon_ecdh.c
+++ b/lib/auth/anon_ecdh.c
@@ -25,17 +25,17 @@
  * handshake.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #if defined(ENABLE_ANON) && defined(ENABLE_ECDHE)
 
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
 #include "auth/anon.h"
-#include "gnutls_num.h"
-#include "gnutls_mpi.h"
-#include <gnutls_state.h>
+#include "num.h"
+#include "mpi.h"
+#include <state.h>
 #include <auth/ecdhe.h>
 #include <ext/ecc.h>
 
diff --git a/lib/auth/cert.c b/lib/auth/cert.c
index f6d5eaafeb..450f9f4d6f 100644
--- a/lib/auth/cert.c
+++ b/lib/auth/cert.c
@@ -24,29 +24,29 @@
  * and are common to RSA and DHE key exchange, are in this file.
  */
 
-#include <gnutls_int.h>
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
+#include "gnutls_int.h"
+#include "auth.h"
+#include "errors.h"
 #include <auth/cert.h>
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
+#include "dh.h"
+#include "num.h"
 #include "libtasn1.h"
-#include "gnutls_datum.h"
+#include "datum.h"
 #include "ext/signature.h"
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <algorithms.h>
-#include <gnutls_global.h>
-#include <gnutls_record.h>
-#include <gnutls_sig.h>
-#include <gnutls_state.h>
-#include <gnutls_pk.h>
-#include <gnutls_x509.h>
+#include <global.h>
+#include <record.h>
+#include <tls-sig.h>
+#include <state.h>
+#include <pk.h>
+#include <x509.h>
 #include <x509/verify-high.h>
 #include <gnutls/abstract.h>
 #include "debug.h"
 
 #ifdef ENABLE_OPENPGP
-#include "openpgp/gnutls_openpgp.h"
+#include "openpgp/openpgp.h"
 
 static gnutls_privkey_t alloc_and_load_pgp_key(const
 					       gnutls_openpgp_privkey_t
diff --git a/lib/auth/cert.h b/lib/auth/cert.h
index e660ec84fb..c99a020e09 100644
--- a/lib/auth/cert.h
+++ b/lib/auth/cert.h
@@ -22,13 +22,13 @@
 
 #ifndef AUTH_CERT_H
 #define AUTH_CERT_H
-#include "gnutls_auth.h"
+#include "auth.h"
 #include <auth/dh_common.h>
 #include <x509/x509_int.h>
 #include <openpgp/openpgp_int.h>
 #include <gnutls/abstract.h>
 #include <gnutls/compat.h>
-#include <gnutls_str_array.h>
+#include <str_array.h>
 
 typedef struct {
 	gnutls_pcert_st *cert_list;	/* a certificate chain */
diff --git a/lib/auth/dh_common.c b/lib/auth/dh_common.c
index 226051e23b..cbb538f58d 100644
--- a/lib/auth/dh_common.c
+++ b/lib/auth/dh_common.c
@@ -26,15 +26,15 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
-#include "gnutls_sig.h"
-#include <gnutls_datum.h>
-#include <gnutls_x509.h>
-#include <gnutls_state.h>
-#include <gnutls_pk.h>
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
+#include "num.h"
+#include "tls-sig.h"
+#include <datum.h>
+#include <x509.h>
+#include <state.h>
+#include <pk.h>
 #include <auth/dh_common.h>
 #include <algorithms.h>
 #include <auth/psk.h>
diff --git a/lib/auth/dh_common.h b/lib/auth/dh_common.h
index 016588062c..3bd8b8ae31 100644
--- a/lib/auth/dh_common.h
+++ b/lib/auth/dh_common.h
@@ -23,7 +23,7 @@
 #ifndef AUTH_DH_COMMON
 #define AUTH_DH_COMMON
 
-#include <gnutls_auth.h>
+#include <auth.h>
 
 typedef struct {
 	int secret_bits;
diff --git a/lib/auth/dhe.c b/lib/auth/dhe.c
index d68817d6ee..16b16bd2a0 100644
--- a/lib/auth/dhe.c
+++ b/lib/auth/dhe.c
@@ -26,16 +26,16 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
-#include "gnutls_sig.h"
-#include <gnutls_datum.h>
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
+#include "num.h"
+#include "tls-sig.h"
+#include <datum.h>
 #include <algorithms.h>
 #include <auth/cert.h>
-#include <gnutls_x509.h>
-#include <gnutls_state.h>
+#include <x509.h>
+#include <state.h>
 #include <auth/dh_common.h>
 #include <auth/ecdhe.h>
 
diff --git a/lib/auth/dhe_psk.c b/lib/auth/dhe_psk.c
index d517b35be0..d4c6b6e0c5 100644
--- a/lib/auth/dhe_psk.c
+++ b/lib/auth/dhe_psk.c
@@ -24,23 +24,23 @@
  * PSK authentication.  The functions here are used in the handshake.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_PSK
 
 /* Contains PSK code for DHE and ECDHE
  */
 
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
 #include <auth/psk.h>
-#include "gnutls_num.h"
-#include "gnutls_mpi.h"
-#include <gnutls_state.h>
+#include "num.h"
+#include "mpi.h"
+#include <state.h>
 #include <auth/dh_common.h>
 #include <auth/ecdhe.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 #include <auth/psk_passwd.h>
 
 static int
diff --git a/lib/auth/ecdhe.c b/lib/auth/ecdhe.c
index 885e6057f3..9376c0b67e 100644
--- a/lib/auth/ecdhe.c
+++ b/lib/auth/ecdhe.c
@@ -25,22 +25,22 @@
  * procedure of the certificate and anoymous authentication.
  */
 
-#include <gnutls_int.h>
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
-#include "gnutls_sig.h"
-#include <gnutls_state.h>
-#include <gnutls_datum.h>
-#include <gnutls_x509.h>
+#include "gnutls_int.h"
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
+#include "num.h"
+#include "tls-sig.h"
+#include <state.h>
+#include <datum.h>
+#include <x509.h>
 #include <auth/ecdhe.h>
-#include <gnutls_ecc.h>
+#include <ecc.h>
 #include <ext/ecc.h>
 #include <algorithms.h>
 #include <auth/psk.h>
 #include <auth/cert.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 
 static int gen_ecdhe_server_kx(gnutls_session_t, gnutls_buffer_st *);
 static int
diff --git a/lib/auth/ecdhe.h b/lib/auth/ecdhe.h
index 33a0f47bb8..063c6707c9 100644
--- a/lib/auth/ecdhe.h
+++ b/lib/auth/ecdhe.h
@@ -23,7 +23,7 @@
 #ifndef AUTH_ECDH_COMMON
 #define AUTH_ECDH_COMMON
 
-#include <gnutls_auth.h>
+#include <auth.h>
 
 int
 _gnutls_gen_ecdh_common_client_kx(gnutls_session_t session,
diff --git a/lib/auth/psk.c b/lib/auth/psk.c
index 7244ed5585..2b3ac41dc0 100644
--- a/lib/auth/psk.c
+++ b/lib/auth/psk.c
@@ -20,19 +20,19 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_PSK
 
-#include "gnutls_errors.h"
-#include "gnutls_auth.h"
-#include "gnutls_auth.h"
+#include "errors.h"
+#include "auth.h"
+#include "auth.h"
 #include "debug.h"
-#include "gnutls_num.h"
+#include "num.h"
 #include <auth/psk.h>
 #include <auth/psk_passwd.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <str.h>
+#include <datum.h>
 
 
 static int _gnutls_proc_psk_client_kx(gnutls_session_t, uint8_t *, size_t);
diff --git a/lib/auth/psk.h b/lib/auth/psk.h
index f9af369796..3c1aba3980 100644
--- a/lib/auth/psk.h
+++ b/lib/auth/psk.h
@@ -23,7 +23,7 @@
 #ifndef AUTH_PSK_H
 #define AUTH_PSK_H
 
-#include <gnutls_auth.h>
+#include <auth.h>
 #include <auth/dh_common.h>
 
 typedef struct gnutls_psk_client_credentials_st {
diff --git a/lib/auth/psk_passwd.c b/lib/auth/psk_passwd.c
index d593c3c453..2ef2c9c901 100644
--- a/lib/auth/psk_passwd.c
+++ b/lib/auth/psk_passwd.c
@@ -22,20 +22,20 @@
 
 /* Functions for operating in an PSK passwd file are included here */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_PSK
 
 #include "x509_b64.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <auth/psk_passwd.h>
 #include <auth/psk.h>
-#include "gnutls_auth.h"
-#include "gnutls_dh.h"
+#include "auth.h"
+#include "dh.h"
 #include "debug.h"
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
-#include <gnutls_num.h>
+#include <str.h>
+#include <datum.h>
+#include <num.h>
 #include <random.h>
 
 
diff --git a/lib/auth/rsa.c b/lib/auth/rsa.c
index d8d0edf29a..4260b945ca 100644
--- a/lib/auth/rsa.c
+++ b/lib/auth/rsa.c
@@ -25,20 +25,20 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
-#include "gnutls_datum.h"
+#include "auth.h"
+#include "errors.h"
+#include "dh.h"
+#include "num.h"
+#include "datum.h"
 #include <auth/cert.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <algorithms.h>
-#include <gnutls_global.h>
+#include <global.h>
 #include "debug.h"
-#include <gnutls_sig.h>
-#include <gnutls_x509.h>
+#include <tls-sig.h>
+#include <x509.h>
 #include <random.h>
-#include <gnutls_mpi.h>
+#include <mpi.h>
 #include <abstract_int.h>
 #include <auth/rsa_common.h>
 
diff --git a/lib/auth/rsa_psk.c b/lib/auth/rsa_psk.c
index a1f460711c..a14baa1eaa 100644
--- a/lib/auth/rsa_psk.c
+++ b/lib/auth/rsa_psk.c
@@ -27,17 +27,17 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_PSK
 
-#include "gnutls_auth.h"
-#include "gnutls_dh.h"
-#include "gnutls_errors.h"
-#include "gnutls_mpi.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "dh.h"
+#include "errors.h"
+#include "mpi.h"
+#include "num.h"
 #include "gnutls_int.h"
-#include "gnutls_pk.h"
+#include "pk.h"
 #include "random.h"
 #include <abstract_int.h>
 #include <algorithms.h>
@@ -46,8 +46,8 @@
 #include <auth/psk_passwd.h>
 #include <auth/rsa_common.h>
 #include <cert.h>
-#include <gnutls_datum.h>
-#include <gnutls_state.h>
+#include <datum.h>
+#include <state.h>
 
 static int _gnutls_gen_rsa_psk_client_kx(gnutls_session_t session,
 					 gnutls_buffer_st * data);
diff --git a/lib/auth/srp.c b/lib/auth/srp_kx.c
index 110d9dc2a4..ec13894d19 100644
--- a/lib/auth/srp.c
+++ b/lib/auth/srp_kx.c
@@ -20,19 +20,18 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_SRP
 
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <auth/srp_passwd.h>
-#include "gnutls_auth.h"
-#include "gnutls_auth.h"
-#include "gnutls_srp.h"
-#include "gnutls_num.h"
-#include <auth/srp.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include "auth.h"
+#include "srp.h"
+#include "num.h"
+#include <auth/srp_kx.h>
+#include <str.h>
+#include <datum.h>
 #include <ext/srp.h>
 
 const mod_auth_st srp_auth_struct = {
diff --git a/lib/auth/srp.h b/lib/auth/srp_kx.h
index 63b9de22b4..013e0cc35e 100644
--- a/lib/auth/srp.h
+++ b/lib/auth/srp_kx.h
@@ -23,7 +23,7 @@
 #ifndef AUTH_SRP_H
 #define AUTH_SRP_H
 
-#include <gnutls_auth.h>
+#include <auth.h>
 
 typedef struct gnutls_srp_client_credentials_st {
 	char *username;
diff --git a/lib/auth/srp_passwd.c b/lib/auth/srp_passwd.c
index 980076845f..4e00f88b4f 100644
--- a/lib/auth/srp_passwd.c
+++ b/lib/auth/srp_passwd.c
@@ -22,21 +22,21 @@
 
 /* Functions for operating in an SRP passwd file are included here */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_SRP
 
 #include "x509_b64.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <auth/srp_passwd.h>
-#include <auth/srp.h>
-#include "gnutls_auth.h"
-#include "gnutls_srp.h"
-#include "gnutls_dh.h"
+#include <auth/srp_kx.h>
+#include "auth.h"
+#include "srp.h"
+#include "dh.h"
 #include "debug.h"
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
-#include <gnutls_num.h>
+#include <str.h>
+#include <datum.h>
+#include <num.h>
 #include <random.h>
 #include <algorithms.h>
 
diff --git a/lib/auth/srp_rsa.c b/lib/auth/srp_rsa.c
index c4a24e09de..33359967da 100644
--- a/lib/auth/srp_rsa.c
+++ b/lib/auth/srp_rsa.c
@@ -20,24 +20,23 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef ENABLE_SRP
 
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <auth/srp_passwd.h>
-#include "gnutls_auth.h"
-#include "gnutls_auth.h"
-#include "gnutls_srp.h"
+#include "auth.h"
+#include "auth.h"
+#include "srp.h"
 #include "debug.h"
-#include "gnutls_num.h"
-#include <auth/srp.h>
-#include <gnutls_str.h>
+#include "num.h"
+#include <auth/srp_kx.h>
+#include <str.h>
 #include <auth/cert.h>
-#include <gnutls_datum.h>
-#include <gnutls_sig.h>
-#include <auth/srp.h>
-#include <gnutls_x509.h>
+#include <datum.h>
+#include <tls-sig.h>
+#include <x509.h>
 #include <algorithms.h>
 
 static int gen_srp_cert_server_kx(gnutls_session_t, gnutls_buffer_st *);
diff --git a/lib/auth/srp_sb64.c b/lib/auth/srp_sb64.c
index c9e2805145..533fbc626c 100644
--- a/lib/auth/srp_sb64.c
+++ b/lib/auth/srp_sb64.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <datum.h>
 #include <auth/srp_passwd.h>
 
 #ifdef ENABLE_SRP