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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index dfe08c8b18066e852c163b3b821e524a6771f22b..e7aaa353c504bfb88d08a9745abe8e68a19aaf83 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,7 @@
 ACLOCAL_AMFLAGS = -I ../m4 -I ../gl/m4
 
 EXTRA_DIST = priority_options.gperf
-BUILT_SOURCES = pkix_asn1_tab.c gnutls_asn1_tab.c priority_options.h
+BUILT_SOURCES = pkix_asn1_tab.c asn1_tab.c priority_options.h
 
 SUBDIRS = includes x509 auth ext algorithms extras accelerated
 
@@ -61,27 +61,19 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 
 lib_LTLIBRARIES = libgnutls.la
 
-SRP_COBJECTS = gnutls_srp.c
-
-PSK_COBJECTS = gnutls_psk.c
-
-COBJECTS = gnutls_range.c gnutls_record.c \
-       gnutls_compress.c debug.c gnutls_cipher.c       \
-       gnutls_mbuffers.c gnutls_buffers.c gnutls_handshake.c           \
-       gnutls_num.c gnutls_errors.c gnutls_dh.c gnutls_kx.c            \
-       gnutls_priority.c gnutls_hash_int.c gnutls_cipher_int.c         \
-       gnutls_session.c gnutls_db.c x509_b64.c gnutls_extensions.c     \
-       gnutls_auth.c gnutls_v2_compat.c gnutls_datum.c                 \
-       gnutls_session_pack.c gnutls_mpi.c gnutls_pk.c gnutls_cert.c    \
-       gnutls_global.c gnutls_constate.c gnutls_anon_cred.c            \
-       pkix_asn1_tab.c gnutls_asn1_tab.c                               \
-       gnutls_mem.c gnutls_ui.c vasprintf.c vasprintf.h                \
-       gnutls_sig.c gnutls_ecc.c gnutls_alert.c gnutls_privkey_raw.c   \
-       system.c inet_ntop.c gnutls_str.c gnutls_state.c gnutls_x509.c \
-       gnutls_helper.c gnutls_supplemental.c   \
-       random.c crypto-api.c gnutls_privkey.c gnutls_pcert.c           \
-       gnutls_pubkey.c locks.c gnutls_dtls.c system_override.c \
-       crypto-backend.c verify-tofu.c pin.c tpm.c fips.c \
+SRP_COBJECTS = srp.c
+
+PSK_COBJECTS = psk.c
+
+COBJECTS = range.c record.c compress.c debug.c cipher.c                        \
+       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 \
+       pk.c cert.c global.c constate.c anon_cred.c pkix_asn1_tab.c asn1_tab.c  \
+       mem.c ui.c vasprintf.c vasprintf.h tls-sig.c ecc.c alert.c privkey_raw.c        \
+       system.c inet_ntop.c str.c state.c x509.c helper.c supplemental.c       \
+       random.c crypto-api.c privkey.c pcert.c pubkey.c locks.c dtls.c         \
+       system_override.c crypto-backend.c verify-tofu.c pin.c tpm.c fips.c     \
        safe-memfuncs.c inet_pton.c atfork.c atfork.h \
        system-keys.h urls.c urls.h prf.c
 
@@ -104,19 +96,19 @@ if ENABLE_NETTLE
 SUBDIRS += nettle
 endif
 
-HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h      \
-       gnutls_buffers.h gnutls_errors.h gnutls_int.h gnutls_dtls.h     \
-       gnutls_handshake.h gnutls_num.h algorithms.h            \
-       gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h   \
-       gnutls_db.h gnutls_auth.h gnutls_extensions.h   \
-       x509_b64.h gnutls_v2_compat.h gnutls_datum.h \
-       gnutls_mpi.h gnutls_pk.h gnutls_record.h                \
-       gnutls_constate.h gnutls_global.h gnutls_sig.h gnutls_mem.h     \
-       gnutls_session_pack.h gnutls_str.h gnutls_str_array.h           \
-       gnutls_state.h gnutls_x509.h crypto-backend.h                   \
-       gnutls_srp.h auth/srp.h auth/srp_passwd.h       \
-       gnutls_helper.h gnutls_supplemental.h crypto.h random.h system.h\
-       locks.h gnutls_mbuffers.h gnutls_ecc.h pin.h fips.h \
+HFILES = abstract_int.h debug.h compress.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        \
+       x509_b64.h sslv2_compat.h datum.h \
+       mpi.h pk.h record.h             \
+       constate.h global.h tls-sig.h mem.h     \
+       session_pack.h str.h str_array.h                \
+       state.h x509.h crypto-backend.h                 \
+       srp.h auth/srp.h auth/srp_passwd.h      \
+       helper.h supplemental.h crypto.h random.h system.h\
+       locks.h mbuffers.h ecc.h pin.h fips.h \
        priority_options.h
 
 if ENABLE_PKCS11
@@ -219,7 +211,7 @@ pkix_asn1_tab.c: $(srcdir)/pkix.asn
        -asn1Parser $(srcdir)/pkix.asn pkix_asn1_tab.c
 
 gnutls_asn1_tab.c: $(srcdir)/gnutls.asn
-       -asn1Parser $(srcdir)/gnutls.asn gnutls_asn1_tab.c
+       -asn1Parser $(srcdir)/gnutls.asn asn1_tab.c
 
 priority_options.h: $(srcdir)/priority_options.gperf
        -gperf --global-table -t $^ > $@-tmp && mv $@-tmp $@

diff --git a/lib/accelerated/cryptodev-gcm.c b/lib/accelerated/cryptodev-gcm.c
index 52f9e85b8cb4aa8a0e2ca51e246aa23300225b69..e992b63b47f75e9894e8c2193b6ba9b80f001da6 100644 (file)
--- a/lib/accelerated/cryptodev-gcm.c
+++ b/lib/accelerated/cryptodev-gcm.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <accelerated/cryptodev.h>
 
 #ifdef ENABLE_CRYPTODEV

diff --git a/lib/accelerated/cryptodev.c b/lib/accelerated/cryptodev.c
index c67dfd2473cb26497843b9e7bdb831a46cef2b41..03a5d66360c4819edc0904c4e2aa249225983c6a 100644 (file)
--- a/lib/accelerated/cryptodev.c
+++ b/lib/accelerated/cryptodev.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <accelerated/cryptodev.h>
 
 #ifdef ENABLE_CRYPTODEV

diff --git a/lib/accelerated/x86/aes-cbc-x86-aesni.c b/lib/accelerated/x86/aes-cbc-x86-aesni.c
index 74a67e7da4e662651db583f6a85fd00235a726c3..b935db9723a680a404518f06e6eb4a16cce2c522 100644 (file)
--- a/lib/accelerated/x86/aes-cbc-x86-aesni.c
+++ b/lib/accelerated/x86/aes-cbc-x86-aesni.c
@@ -25,10 +25,10 @@
  * using intel's AES instruction set. 
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <sha-x86.h>
 #include <x86-common.h>

diff --git a/lib/accelerated/x86/aes-cbc-x86-ssse3.c b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
index 0617d203c8e149bb948cf41d12a2ddcb8b14f650..9e367cad947dff28393b0437c5ed1148510123b2 100644 (file)
--- a/lib/accelerated/x86/aes-cbc-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-cbc-x86-ssse3.c
@@ -25,10 +25,10 @@
  * using intel's AES instruction set. 
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <sha-x86.h>
 #include <x86-common.h>

diff --git a/lib/accelerated/x86/aes-ccm-x86-aesni.c b/lib/accelerated/x86/aes-ccm-x86-aesni.c
index fb8ba766c9915db031021b7648b331b22b6f5e9a..4828a229dfcf151b7eeba5bbc97ba8660599b085 100644 (file)
--- a/lib/accelerated/x86/aes-ccm-x86-aesni.c
+++ b/lib/accelerated/x86/aes-ccm-x86-aesni.c
@@ -25,13 +25,13 @@
  * using AESNI (without PCLMUL)
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 
 #ifdef HAVE_LIBNETTLE
 
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #include <byteswap.h>

diff --git a/lib/accelerated/x86/aes-gcm-padlock.c b/lib/accelerated/x86/aes-gcm-padlock.c
index 410cfc055fdd4f499f3f85db9240b03a1901ac07..51b02a8d5c874bf966f223ae851ab62e0c0eab22 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-padlock.c
+++ b/lib/accelerated/x86/aes-gcm-padlock.c
@@ -24,13 +24,13 @@
  * The following code is an implementation of the AES-128-GCM cipher
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 
 #ifdef HAVE_LIBNETTLE
 
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #include <byteswap.h>

diff --git a/lib/accelerated/x86/aes-gcm-x86-aesni.c b/lib/accelerated/x86/aes-gcm-x86-aesni.c
index d102732ff436770e6a5d074ca076ad3863e37cf2..9cae52891234479f1d095935b9c9af70123ed7b8 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-aesni.c
+++ b/lib/accelerated/x86/aes-gcm-x86-aesni.c
@@ -25,13 +25,13 @@
  * using AESNI (without PCLMUL)
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 
 #ifdef HAVE_LIBNETTLE
 
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #include <byteswap.h>

diff --git a/lib/accelerated/x86/aes-gcm-x86-pclmul.c b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
index b6672d64f028b4a4505c940f59301c72af5e7d0c..40d47698032ef0eee7e9e49999a1ae01db4bf719 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-pclmul.c
+++ b/lib/accelerated/x86/aes-gcm-x86-pclmul.c
@@ -25,10 +25,10 @@
  * using intel's AES instruction set.
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #include <nettle/memxor.h>

diff --git a/lib/accelerated/x86/aes-gcm-x86-ssse3.c b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
index a655eb44b6e56f73ba2caed49fa00e12a6ea0622..512a8cffd7b4af976c094adafb2e8fab6c5ce0cf 100644 (file)
--- a/lib/accelerated/x86/aes-gcm-x86-ssse3.c
+++ b/lib/accelerated/x86/aes-gcm-x86-ssse3.c
@@ -24,13 +24,13 @@
  * The following code is an implementation of the AES-128-GCM cipher
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 
 #ifdef HAVE_LIBNETTLE
 
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #include <byteswap.h>

diff --git a/lib/accelerated/x86/aes-padlock.c b/lib/accelerated/x86/aes-padlock.c
index 3e1c4f5a14fdaa66f8fd031d0e40f425f0cc2088..ceda0faa5f49f9884da6f33efdf1776e6b8ac1cc 100644 (file)
--- a/lib/accelerated/x86/aes-padlock.c
+++ b/lib/accelerated/x86/aes-padlock.c
@@ -25,10 +25,10 @@
  * using VIA Padlock instruction set. 
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <x86-common.h>
 #ifdef HAVE_LIBNETTLE

diff --git a/lib/accelerated/x86/aes-padlock.h b/lib/accelerated/x86/aes-padlock.h
index d19ad48d47e4d2f8cc5f76c51e40f053fd6e6c03..cff3128f147edee4c88cabf1cd4ff4000251de79 100644 (file)
--- a/lib/accelerated/x86/aes-padlock.h
+++ b/lib/accelerated/x86/aes-padlock.h
@@ -1,7 +1,7 @@
 #ifndef AES_PADLOCK_H
 #define AES_PADLOCK_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <aes-x86.h>
 
 struct padlock_cipher_data {

diff --git a/lib/accelerated/x86/aes-x86.h b/lib/accelerated/x86/aes-x86.h
index 4de2631709ef407781e38e6b1493a5fd51bcf92c..e25991bb8c70424b1e6d0597028d2c8b03ada3e0 100644 (file)
--- a/lib/accelerated/x86/aes-x86.h
+++ b/lib/accelerated/x86/aes-x86.h
@@ -1,7 +1,7 @@
 #ifndef AES_X86_H
 #define AES_X86_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 void register_x86_crypto(void);
 

diff --git a/lib/accelerated/x86/hmac-padlock.c b/lib/accelerated/x86/hmac-padlock.c
index 868e9f725b0d06d0ce4dfd5ffc1985c6dd97c079..1d1a1bd1e608f2661f249beeede0068b095fe330 100644 (file)
--- a/lib/accelerated/x86/hmac-padlock.c
+++ b/lib/accelerated/x86/hmac-padlock.c
@@ -24,9 +24,9 @@
  * VIA Padlock hardware acceleration.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_hash_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <hash_int.h>
+#include "errors.h"
 #include <nettle/sha.h>
 #include <nettle/hmac.h>
 #include <nettle/macros.h>

diff --git a/lib/accelerated/x86/hmac-x86-ssse3.c b/lib/accelerated/x86/hmac-x86-ssse3.c
index 0d5004d30c741b7568c5f311cb42988b54892e19..54a81140c4b7faf809cf60eb24344aef632196d2 100644 (file)
--- a/lib/accelerated/x86/hmac-x86-ssse3.c
+++ b/lib/accelerated/x86/hmac-x86-ssse3.c
@@ -24,9 +24,9 @@
  * VIA Padlock hardware acceleration.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_hash_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <hash_int.h>
+#include "errors.h"
 #include <nettle/sha.h>
 #include <nettle/hmac.h>
 #include <nettle/macros.h>

diff --git a/lib/accelerated/x86/sha-padlock.c b/lib/accelerated/x86/sha-padlock.c
index 04b42e455eb6c97a14908ef432c936082ac932d8..dc74a50f5396f2cc8471dabb5943eaf5373759a5 100644 (file)
--- a/lib/accelerated/x86/sha-padlock.c
+++ b/lib/accelerated/x86/sha-padlock.c
@@ -21,9 +21,9 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_hash_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <hash_int.h>
+#include "errors.h"
 #include <nettle/sha.h>
 #include <nettle/hmac.h>
 #include <nettle/macros.h>

diff --git a/lib/accelerated/x86/sha-x86-ssse3.c b/lib/accelerated/x86/sha-x86-ssse3.c
index 52c6ab0ac4ab3c17b0bdc2fb02ad3bc8e82bbe1a..e99885bcf2d490655900d3c118a03264007f1041 100644 (file)
--- a/lib/accelerated/x86/sha-x86-ssse3.c
+++ b/lib/accelerated/x86/sha-x86-ssse3.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <nettle/sha.h>
 #include <nettle/macros.h>

diff --git a/lib/accelerated/x86/x86-common.c b/lib/accelerated/x86/x86-common.c
index 0f355cc41151f2330f8bba76118cc3a2572fa8c0..18e37103629a4e5b1e4760ce81dbbe5fe1139998 100644 (file)
--- a/lib/accelerated/x86/x86-common.c
+++ b/lib/accelerated/x86/x86-common.c
@@ -25,10 +25,10 @@
  * using intel's AES instruction set. 
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <aes-x86.h>
 #include <sha-x86.h>
 #include <x86-common.h>

diff --git a/lib/gnutls_alert.c b/lib/alert.c
similarity index 99%
rename from lib/gnutls_alert.c
rename to lib/alert.c
index fb3a9d624bac5448cda6c3d21ed5520f80dfef1c..f0c4af8effdd0630bf20d45660f15469e503c67d 100644 (file)
--- a/lib/gnutls_alert.c
+++ b/lib/alert.c
@@ -20,11 +20,11 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_record.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <record.h>
 #include <debug.h>
-#include <gnutls_str.h>
+#include "str.h"
 
 typedef struct {
        gnutls_alert_description_t alert;

diff --git a/lib/algorithms.h b/lib/algorithms.h
index f9f0be19ce68ac7fedf157c4522349665833a52b..9dcfc011602670437dd823532e86042a71689a39 100644 (file)
--- a/lib/algorithms.h
+++ b/lib/algorithms.h
@@ -23,7 +23,7 @@
 #ifndef ALGORITHMS_H
 #define ALGORITHMS_H
 
-#include "gnutls_auth.h"
+#include "auth.h"
 
 #define GNUTLS_RENEGO_PROTECTION_REQUEST_MAJOR 0x00
 #define GNUTLS_RENEGO_PROTECTION_REQUEST_MINOR 0xFF

diff --git a/lib/algorithms/cert_types.c b/lib/algorithms/cert_types.c
index 7ccab552e31acbcdf2c5c73f2167a4de020bbb5b..ca014507dc159951118e116f674e13a638b71a04 100644 (file)
--- a/lib/algorithms/cert_types.c
+++ b/lib/algorithms/cert_types.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 /**

diff --git a/lib/algorithms/ciphers.c b/lib/algorithms/ciphers.c
index dc6fd1c0972fb724fcf1598e08d0a3b65ba23b97..1c5529c50772d967b6622cefa207bd9913b2391c 100644 (file)
--- a/lib/algorithms/ciphers.c
+++ b/lib/algorithms/ciphers.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 

diff --git a/lib/algorithms/ciphersuites.c b/lib/algorithms/ciphersuites.c
index f8e9f3c8fe11fe0ac461d6807415484b2bbbe397..68334b350bada7abe6d89f48037e3ac0587899b3 100644 (file)
--- a/lib/algorithms/ciphersuites.c
+++ b/lib/algorithms/ciphersuites.c
@@ -20,11 +20,11 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
-#include <gnutls_dh.h>
-#include <gnutls_state.h>
+#include "errors.h"
+#include <dh.h>
+#include <state.h>
 #include <x509/common.h>
 #include <auth/cert.h>
 #include <auth/anon.h>

diff --git a/lib/algorithms/ecc.c b/lib/algorithms/ecc.c
index cef9bf4c6adde3b865bb71c71cb416bf04d9e407..b42d95aa4dc01341299d95402902a2e9a013e74c 100644 (file)
--- a/lib/algorithms/ecc.c
+++ b/lib/algorithms/ecc.c
@@ -20,11 +20,11 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 
 /* Supported ECC curves
  */

diff --git a/lib/algorithms/kx.c b/lib/algorithms/kx.c
index 587ec532680337573a2d1a4cbeb18445620b3e08..6373f930a08da1eff52f758d78ad3de3a69d9a40 100644 (file)
--- a/lib/algorithms/kx.c
+++ b/lib/algorithms/kx.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 

diff --git a/lib/algorithms/mac.c b/lib/algorithms/mac.c
index c8b2c941ec0386209024988daa3502f36718a435..cca95b4513c53b232a60809990071af8f43aaaaa 100644 (file)
--- a/lib/algorithms/mac.c
+++ b/lib/algorithms/mac.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 static const mac_entry_st hash_algorithms[] = {

diff --git a/lib/algorithms/protocols.c b/lib/algorithms/protocols.c
index 35208b4ac6a0177a23f3d48440a6084a10e1accb..0682f1c19be109fbd6d5db88b860991c75e0bfec 100644 (file)
--- a/lib/algorithms/protocols.c
+++ b/lib/algorithms/protocols.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 /* TLS Versions */

diff --git a/lib/algorithms/publickey.c b/lib/algorithms/publickey.c
index d921be4a631b914e7757a03b40265f03731d9787..183f436899bfd952192de48b6497e05064a2281a 100644 (file)
--- a/lib/algorithms/publickey.c
+++ b/lib/algorithms/publickey.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 

diff --git a/lib/algorithms/secparams.c b/lib/algorithms/secparams.c
index 11ae8db3ee6e980cc41412e35143869a184cd840..ab02c15d4113ffb814c7e65d5dd9fbec9adca896 100644 (file)
--- a/lib/algorithms/secparams.c
+++ b/lib/algorithms/secparams.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 typedef struct {

diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index f322d3cc9d44d7123e91bfa152c72f63d52af839..f2ac184667f28766d1d4ad8ecde110a84099d092 100644 (file)
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <x509/common.h>
 
 /* signature algorithms;

diff --git a/lib/gnutls_anon_cred.c b/lib/anon_cred.c
similarity index 96%
rename from lib/gnutls_anon_cred.c
rename to lib/anon_cred.c
index 5818fbdaad6abf6bf41ddf1844500a8c7c8c0223..6d45c8f3869ecb33550469dc797819e9e93e319e 100644 (file)
--- a/lib/gnutls_anon_cred.c
+++ b/lib/anon_cred.c
@@ -24,12 +24,12 @@
 
 #ifdef ENABLE_ANON
 
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <auth/anon.h>
-#include "gnutls_auth.h"
-#include "gnutls_dh.h"
-#include "gnutls_num.h"
-#include "gnutls_mpi.h"
+#include "auth.h"
+#include "dh.h"
+#include "num.h"
+#include "mpi.h"
 
 /**
  * gnutls_anon_free_server_credentials:

diff --git a/lib/gnutls_asn1_tab.c b/lib/asn1_tab.c
similarity index 100%
rename from lib/gnutls_asn1_tab.c
rename to lib/asn1_tab.c

diff --git a/lib/atfork.c b/lib/atfork.c
index 3ef9bb9e92d19bd93b59ed5c1a57f408b6bcbbb0..8ec81153ef21011f7d1a8523be6ba317e26caaa1 100644 (file)
--- a/lib/atfork.c
+++ b/lib/atfork.c
@@ -22,8 +22,8 @@
  */
 
 #include <config.h>
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 
 #include <sys/socket.h>
 #include <errno.h>

diff --git a/lib/atfork.h b/lib/atfork.h
index 6c046d0ae0061aae56dcdd47d1f96737d996aacd..a6f4c2a98f49d64264ff6b1360df729ba11d6054 100644 (file)
--- a/lib/atfork.h
+++ b/lib/atfork.h
@@ -24,7 +24,7 @@
 # define ATFORK_H
 
 #include <config.h>
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 extern unsigned int _gnutls_forkid;
 

diff --git a/lib/gnutls_auth.c b/lib/auth.c
similarity index 99%
rename from lib/gnutls_auth.c
rename to lib/auth.c
index 1238da8d5cccde76e248a9c3993bf5d6015d26e3..178d5f2acaec14b44f4f198ce3f5733c961791df 100644 (file)
--- a/lib/gnutls_auth.c
+++ b/lib/auth.c
@@ -21,14 +21,14 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_auth.h"
-#include "gnutls_auth.h"
+#include "errors.h"
+#include "auth.h"
+#include "auth.h"
 #include "algorithms.h"
 #include <auth/cert.h>
 #include <auth/psk.h>
 #include <auth/anon.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 
 /* The functions here are used in order for authentication algorithms
  * to be able to retrieve the needed credentials eg public and private

diff --git a/lib/gnutls_auth.h b/lib/auth.h
similarity index 99%
rename from lib/gnutls_auth.h
rename to lib/auth.h
index 6e843a82dc05ac146a9c1af3a4c85a8f4b84a829..0674e1807bde68c65c574a861d419218db56a5bc 100644 (file)
--- a/lib/gnutls_auth.h
+++ b/lib/auth.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_AUTH_H
 #define GNUTLS_AUTH_H
 
-#include <gnutls_str.h>
+#include "str.h"
 
 typedef struct mod_auth_st_int {
        const char *name;       /* null terminated */

diff --git a/lib/auth/Makefile.am b/lib/auth/Makefile.am
index 319d3700e6bf922cdda80ec6871c958622c5346e..af8c266383c88a4b2f3c04d36aa1cdeae0670e72 100644 (file)
--- 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 f72c712e3c381f2cd0572c2e30bcc12366758bd0..24cfd74f0dee1500bdf72ce22527b0ce417654e8 100644 (file)
--- 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 6424fdd9a7c5f1a4983909404ae496ab2533947d..eb88e86144f31be3e0f29781264847f0722def24 100644 (file)
--- 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 e171da84b524a086abc65c14e18c31129aa2e18e..1f8a9b7a2b7a3e97eac604d1d8774a2758cce163 100644 (file)
--- 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 f6d5eaafebdd94a2ba01f06dc8269358f9b939ef..450f9f4d6f64ccd3be194fc74d25fa2a03e18cdb 100644 (file)
--- 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 e660ec84fbeba8d9f215904698ffbdcb0fe1dea3..c99a020e090f7005fd728303df46187d2a0fa4fd 100644 (file)
--- 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 226051e23b08d5e3c5132cdb2824e072a2d46fab..cbb538f58de39afeb25308c908b2f5b080720179 100644 (file)
--- 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 016588062c88b2b86e280e11ece4889b80df851f..3bd8b8ae313d2d2395faddd835845166f03eca95 100644 (file)
--- 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 d68817d6eef9e57d51b52e668b2216dead7a902b..16b16bd2a068db9a5b4ce0d6f079885d50558135 100644 (file)
--- 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 d517b35be09416d1168ff4cb36789389618d8c0b..d4c6b6e0c5d9bb7c213ffdce466513bc887bfcff 100644 (file)
--- 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 885e6057f371968d0e31bcedf2bedbbe8925dc70..9376c0b67edff58d548741ea21568f2b7f04e4bd 100644 (file)
--- 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 33a0f47bb8eeb608e8d06f5a96fb3d7fd4b75fd7..063c6707c90f3c070ce4b9c77c4f9fbab9a16831 100644 (file)
--- 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 7244ed5585fd9dfc452cb3fbc967bd89cb8a34f2..2b3ac41dc0eb5fd40f9e519fb8e0fcc28d5b1fc9 100644 (file)
--- 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 f9af36979604659f95cdc61d77b0b47ba4f58496..3c1aba39804f937da6a6673b9cc7d29c30a7e3c5 100644 (file)
--- 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 d593c3c453fb1a85f95f612ed675bedce9443d72..2ef2c9c9012589927246c0203f4d72f82a5b6b30 100644 (file)
--- 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 d8d0edf29acae5dffb26fc4f40f3ead067ecca7e..4260b945ca148cd99b287dd564b803991037df33 100644 (file)
--- 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 a1f460711c7bf611729503c6626b3f4e7628fd7f..a14baa1eaa386c4251876062f5460116ec9791eb 100644 (file)
--- 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
similarity index 99%
rename from lib/auth/srp.c
rename to lib/auth/srp_kx.c
index 110d9dc2a46f25647978bc83dd062742e2093e20..ec13894d198040666127fe6d7249e9128142d6f2 100644 (file)
--- 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
similarity index 98%
rename from lib/auth/srp.h
rename to lib/auth/srp_kx.h
index 63b9de22b4ccc1f9d01722206764d8d48429043f..013e0cc35ef9895330bfaeee9f9f6f7762fdc53b 100644 (file)
--- 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 980076845ffea0e6eeeb11afefc9ed17e159de3f..4e00f88b4ff20af5b355c34ac2ba1cf8043fab46 100644 (file)
--- 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 c4a24e09dea7a07cdcbbd85b8eab3ff4f8929088..33359967da1f316fe018e3e0943f411f4d167c21 100644 (file)
--- 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 c9e2805145559c2243737fc9924f19139a0a3fa3..533fbc626c3231fae7d8444c5f3020c86823d6da 100644 (file)
--- 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

diff --git a/lib/gnutls_buffers.c b/lib/buffers.c
similarity index 99%
rename from lib/gnutls_buffers.c
rename to lib/buffers.c
index 37d0a8923469bcec0beeebd9eeb190284f1dea29..cc340710ff11a6040ebb97e8ad2d12d6b0b27b84 100644 (file)
--- a/lib/gnutls_buffers.c
+++ b/lib/buffers.c
@@ -39,17 +39,17 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_record.h>
-#include <gnutls_buffers.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_state.h>
-#include <gnutls_dtls.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
+#include <record.h>
+#include <buffers.h>
+#include <mbuffers.h>
+#include <state.h>
+#include <dtls.h>
 #include <system.h>
-#include <gnutls_constate.h>   /* gnutls_epoch_get */
-#include <gnutls_handshake.h>  /* remaining_time() */
+#include <constate.h>  /* gnutls_epoch_get */
+#include <handshake.h> /* remaining_time() */
 #include <errno.h>
 #include <system.h>
 #include "debug.h"

diff --git a/lib/gnutls_buffers.h b/lib/buffers.h
similarity index 100%
rename from lib/gnutls_buffers.h
rename to lib/buffers.h

diff --git a/lib/gnutls_cert.c b/lib/cert.c
similarity index 98%
rename from lib/gnutls_cert.c
rename to lib/cert.c
index 54ec023a9e952f5274a1e367b9090a891e7765fb..36f87adaf2a63ba83d0290fad2fca514e336bbe2 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/cert.c
@@ -24,25 +24,25 @@
  * in this file.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <auth/cert.h>
-#include <gnutls_datum.h>
-#include <gnutls_mpi.h>
-#include <gnutls_global.h>
+#include <datum.h>
+#include <mpi.h>
+#include <global.h>
 #include <algorithms.h>
-#include <gnutls_dh.h>
-#include <gnutls_str.h>
-#include <gnutls_state.h>
-#include <gnutls_auth.h>
-#include <gnutls_x509.h>
-#include <gnutls_str_array.h>
+#include <dh.h>
+#include "str.h"
+#include <state.h>
+#include <auth.h>
+#include <x509.h>
+#include <str_array.h>
 #include <x509/verify-high.h>
 #include "x509/x509_int.h"
 #ifdef ENABLE_OPENPGP
-#include "openpgp/gnutls_openpgp.h"
+#include "openpgp/openpgp.h"
 #endif
-#include <gnutls_str.h>
+#include "str.h"
 
 /**
  * gnutls_certificate_free_keys:

diff --git a/lib/gnutls_cipher.c b/lib/cipher.c
similarity index 98%
rename from lib/gnutls_cipher.c
rename to lib/cipher.c
index ea79068d019a305d94451e48e06fd77a53d22f3d..56c5cb1284f56732ebedae985d133ae0f88fc697 100644 (file)
--- a/lib/gnutls_cipher.c
+++ b/lib/cipher.c
@@ -26,20 +26,20 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_compress.h"
-#include "gnutls_cipher.h"
+#include "errors.h"
+#include "compress.h"
+#include "cipher.h"
 #include "algorithms.h"
-#include "gnutls_hash_int.h"
-#include "gnutls_cipher_int.h"
+#include "hash_int.h"
+#include "cipher_int.h"
 #include "debug.h"
-#include "gnutls_num.h"
-#include "gnutls_datum.h"
-#include "gnutls_kx.h"
-#include "gnutls_record.h"
-#include "gnutls_constate.h"
-#include "gnutls_mbuffers.h"
-#include <gnutls_state.h>
+#include "num.h"
+#include "datum.h"
+#include "kx.h"
+#include "record.h"
+#include "constate.h"
+#include "mbuffers.h"
+#include <state.h>
 #include <random.h>
 
 static int compressed_to_ciphertext(gnutls_session_t session,

diff --git a/lib/gnutls_cipher.h b/lib/cipher.h
similarity index 100%
rename from lib/gnutls_cipher.h
rename to lib/cipher.h

diff --git a/lib/gnutls_cipher_int.c b/lib/cipher_int.c
similarity index 98%
rename from lib/gnutls_cipher_int.c
rename to lib/cipher_int.c
index 8e7647ecf230f944b21efe3c79520287bcba65a7..052d559330de827458fc90fd3be77d01215bd530 100644 (file)
--- a/lib/gnutls_cipher_int.c
+++ b/lib/cipher_int.c
@@ -21,10 +21,10 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_cipher_int.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <cipher_int.h>
+#include <datum.h>
 #include <gnutls/crypto.h>
 #include <crypto.h>
 #include <fips.h>

diff --git a/lib/gnutls_cipher_int.h b/lib/cipher_int.h
similarity index 99%
rename from lib/gnutls_cipher_int.h
rename to lib/cipher_int.h
index 7fdcb3c240eac6617254ac4e7d11f7c22f15edc5..b2dd763d22bd2a82aea19fa4376c090e89186173 100644 (file)
--- a/lib/gnutls_cipher_int.h
+++ b/lib/cipher_int.h
@@ -24,7 +24,7 @@
 #define GNUTLS_CIPHER_INT
 
 #include <gnutls/crypto.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <crypto-backend.h>
 
 extern int crypto_cipher_prio;

diff --git a/lib/gnutls_compress.c b/lib/compress.c
similarity index 99%
rename from lib/gnutls_compress.c
rename to lib/compress.c
index 16b128487a63d594f1697dbe7133d05087cc6540..2e7197fb634cd179aa4f1aa8dbaf4072d5a20064 100644 (file)
--- a/lib/gnutls_compress.c
+++ b/lib/compress.c
@@ -25,9 +25,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_compress.h"
-#include "gnutls_errors.h"
-#include "gnutls_constate.h"
+#include "compress.h"
+#include "errors.h"
+#include "constate.h"
 #include <algorithms.h>
 #include <gnutls/gnutls.h>
 

diff --git a/lib/gnutls_compress.h b/lib/compress.h
similarity index 100%
rename from lib/gnutls_compress.h
rename to lib/compress.h

diff --git a/lib/gnutls_constate.c b/lib/constate.c
similarity index 98%
rename from lib/gnutls_constate.c
rename to lib/constate.c
index 544134026b4a634548827f55345788658c951c2a..d89079363a5752a505d625108e3bde807a3abc74 100644 (file)
--- a/lib/gnutls_constate.c
+++ b/lib/constate.c
@@ -24,16 +24,16 @@
  * finished. These functions activate the established security parameters.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_constate.h>
-#include <gnutls_errors.h>
-#include <gnutls_kx.h>
+#include "gnutls_int.h"
+#include <constate.h>
+#include "errors.h"
+#include <kx.h>
 #include <algorithms.h>
-#include <gnutls_num.h>
-#include <gnutls_datum.h>
-#include <gnutls_state.h>
-#include <gnutls_extensions.h>
-#include <gnutls_buffers.h>
+#include <num.h>
+#include <datum.h>
+#include <state.h>
+#include <extensions.h>
+#include <buffers.h>
 
 static int
 _gnutls_set_kx(gnutls_session_t session, gnutls_kx_algorithm_t algo);

diff --git a/lib/gnutls_constate.h b/lib/constate.h
similarity index 100%
rename from lib/gnutls_constate.h
rename to lib/constate.h

diff --git a/lib/crypto-api.c b/lib/crypto-api.c
index e169092cf1d0cc92cf0e8f32f201e33d7fadd647..f6de124e68ef41b8d6fcd3ada3983086b416217c 100644 (file)
--- a/lib/crypto-api.c
+++ b/lib/crypto-api.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_cipher_int.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <cipher_int.h>
+#include <datum.h>
 #include <gnutls/crypto.h>
 #include <algorithms.h>
 #include <random.h>

diff --git a/lib/crypto-backend.c b/lib/crypto-backend.c
index 714f86f9fb4e88d3619470bcf02929c86605d348..32f66d3e140cd55e3c34ef7e8d29935936a5b94f 100644 (file)
--- a/lib/crypto-backend.c
+++ b/lib/crypto-backend.c
@@ -20,15 +20,15 @@
  *
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
+#include "errors.h"
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
 #include <crypto-backend.h>
 #include <crypto.h>
-#include <gnutls_mpi.h>
-#include <gnutls_pk.h>
+#include <mpi.h>
+#include <pk.h>
 #include <random.h>
-#include <gnutls_cipher_int.h>
+#include <cipher_int.h>
 
 /* default values for priorities */
 int crypto_mac_prio = INT_MAX;

diff --git a/lib/crypto-selftests-pk.c b/lib/crypto-selftests-pk.c
index 31afb0be1440bf50b8a0c4ac0fddeb41559db560..84a9963cea9705200b96b2ac12153ad340767df6 100644 (file)
--- a/lib/crypto-selftests-pk.c
+++ b/lib/crypto-selftests-pk.c
@@ -20,15 +20,15 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_cipher_int.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <cipher_int.h>
+#include <datum.h>
 #include <gnutls/crypto.h>
 #include <gnutls/self-test.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <gnutls/abstract.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <debug.h>
 
 #define DATASTR "Hello there!"

diff --git a/lib/crypto-selftests.c b/lib/crypto-selftests.c
index 7999b79507065bccfd4e6dfdeb7946a7d211a71d..310a54518d386ff736f0c69ed1c3d708032b78f3 100644 (file)
--- a/lib/crypto-selftests.c
+++ b/lib/crypto-selftests.c
@@ -20,13 +20,13 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_cipher_int.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <cipher_int.h>
+#include <datum.h>
 #include <gnutls/crypto.h>
 #include <gnutls/self-test.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <random.h>
 #include <crypto.h>
 

diff --git a/lib/gnutls_datum.c b/lib/datum.c
similarity index 95%
rename from lib/gnutls_datum.c
rename to lib/datum.c
index 545e090f274df416d6adf20fb81624c3a18be316..41c54d3369dbde8207e98104c41c3ff07e43dea2 100644 (file)
--- a/lib/gnutls_datum.c
+++ b/lib/datum.c
@@ -25,10 +25,10 @@
  * should be preallocated (datum.size+(bits/8))
  */
 
-#include <gnutls_int.h>
-#include <gnutls_num.h>
-#include <gnutls_datum.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <num.h>
+#include <datum.h>
+#include "errors.h"
 
 int
 _gnutls_set_datum(gnutls_datum_t * dat, const void *data, size_t data_size)

diff --git a/lib/gnutls_datum.h b/lib/datum.h
similarity index 98%
rename from lib/gnutls_datum.h
rename to lib/datum.h
index 4f7205863e91f9d302835a30687789fc78fbabb9..6b4ff48b8fa4dbb5d1bc8991e68b3439f500c333 100644 (file)
--- a/lib/gnutls_datum.h
+++ b/lib/datum.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_DATUM_H
 #define GNUTLS_DATUM_H
 
-# include <gnutls_int.h>
+# include "gnutls_int.h"
 
 int _gnutls_set_datum(gnutls_datum_t * dat, const void *data,
                      size_t data_size);

diff --git a/lib/gnutls_db.c b/lib/db.c
similarity index 98%
rename from lib/gnutls_db.c
rename to lib/db.c
index 82737d2c86ba07fe8168349c2474fc71809b8c68..2554251f28bf1e17df86e590d473523eb845444b 100644 (file)
--- a/lib/gnutls_db.c
+++ b/lib/db.c
@@ -25,10 +25,10 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include <gnutls_db.h>
-#include <gnutls_session_pack.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <db.h>
+#include <session_pack.h>
+#include <datum.h>
 
 /**
  * gnutls_db_set_retrieve_function:

diff --git a/lib/gnutls_db.h b/lib/db.h
similarity index 100%
rename from lib/gnutls_db.h
rename to lib/db.h

diff --git a/lib/debug.c b/lib/debug.c
index b50e1f1bf5d9bbad01e315cd56cac57ce10e7e85..6ab12c6943494a0f2f0c3c51bfcdbefe456832fc 100644 (file)
--- a/lib/debug.c
+++ b/lib/debug.c
@@ -21,11 +21,11 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "debug.h"
-#include <gnutls_mpi.h>
+#include <mpi.h>
 
 #ifdef DEBUG
 void _gnutls_dump_mpi(const char *prefix, bigint_t a)

diff --git a/lib/gnutls_dh.c b/lib/dh.c
similarity index 98%
rename from lib/gnutls_dh.c
rename to lib/dh.c
index 2f7ed4ce98f68e7c5f11c07478df3bba4d1f961e..82a411934c5a5e7dbfb3e3a7719355730dea4a57 100644 (file)
--- a/lib/gnutls_dh.c
+++ b/lib/dh.c
@@ -20,17 +20,17 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <datum.h>
 #include <x509_b64.h>          /* for PKCS3 PEM decoding */
-#include <gnutls_global.h>
-#include <gnutls_dh.h>
-#include <gnutls_pk.h>
+#include <global.h>
+#include <dh.h>
+#include <pk.h>
 #include <x509/common.h>
 #include <gnutls/crypto.h>
 #include "x509/x509_int.h"
-#include <gnutls_mpi.h>
+#include <mpi.h>
 #include "debug.h"
 
 /*-

diff --git a/lib/gnutls_dh.h b/lib/dh.h
similarity index 100%
rename from lib/gnutls_dh.h
rename to lib/dh.h

diff --git a/lib/gnutls_dtls.c b/lib/dtls.c
similarity index 99%
rename from lib/gnutls_dtls.c
rename to lib/dtls.c
index fda04fe9653268030f503eda3caf8e440c861cb4..26ddaf2b774968fc412f50776ea0778368cdad57 100644 (file)
--- a/lib/gnutls_dtls.c
+++ b/lib/dtls.c
@@ -26,14 +26,14 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include "debug.h"
-#include "gnutls_dtls.h"
-#include "gnutls_record.h"
-#include <gnutls_mbuffers.h>
-#include <gnutls_buffers.h>
-#include <gnutls_constate.h>
-#include <gnutls_state.h>
+#include "dtls.h"
+#include "record.h"
+#include <mbuffers.h>
+#include <buffers.h>
+#include <constate.h>
+#include <state.h>
 #include <gnutls/dtls.h>
 #include <algorithms.h>
 

diff --git a/lib/gnutls_dtls.h b/lib/dtls.h
similarity index 97%
rename from lib/gnutls_dtls.h
rename to lib/dtls.h
index 25e76b93ca33ad90d30d35953af8c3bbbee1bc01..2c694ebffc8dd288de7c479c5f93d3f71e3cc792 100644 (file)
--- a/lib/gnutls_dtls.h
+++ b/lib/dtls.h
@@ -24,10 +24,10 @@
 #define DTLS_H
 
 #include <config.h>
-#include <gnutls_int.h>
-#include <gnutls_buffers.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_constate.h>
+#include "gnutls_int.h"
+#include <buffers.h>
+#include <mbuffers.h>
+#include <constate.h>
 
 int _dtls_transmit(gnutls_session_t session);
 int _dtls_record_check(struct record_parameters_st *rp, uint64 * _seq);

diff --git a/lib/gnutls_ecc.c b/lib/ecc.c
similarity index 96%
rename from lib/gnutls_ecc.c
rename to lib/ecc.c
index aa6399b5dfd8a3027a9c1979dcfa1a805be40342..14ad242fac9bc5259043dd030dadec47bfc34a4d 100644 (file)
--- a/lib/gnutls_ecc.c
+++ b/lib/ecc.c
@@ -23,11 +23,11 @@
 /* Helper functions for ECC handling 
  * based on public domain code by Tom St. Dennis.
  */
-#include <gnutls_int.h>
-#include <gnutls_mpi.h>
-#include <gnutls_ecc.h>
+#include "gnutls_int.h"
+#include <mpi.h>
+#include <ecc.h>
 #include <algorithms.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 
 int
 _gnutls_ecc_ansi_x963_export(gnutls_ecc_curve_t curve, bigint_t x,

diff --git a/lib/gnutls_ecc.h b/lib/ecc.h
similarity index 100%
rename from lib/gnutls_ecc.h
rename to lib/ecc.h

diff --git a/lib/gnutls_errors.c b/lib/errors.c
similarity index 99%
rename from lib/gnutls_errors.c
rename to lib/errors.c
index 885427b98084291234ce73a464ba48f7cf09cc91..219deb179a14a480348115b156e4cac200e2cd1a 100644 (file)
--- a/lib/gnutls_errors.c
+++ b/lib/errors.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include "gnutls_errors.h"
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
 #ifdef STDC_HEADERS
 #include <stdarg.h>
 #endif
 #include "vasprintf.h"
-#include <gnutls_str.h>
+#include "str.h"
 
 #define ERROR_ENTRY(desc, name) \
        { desc, #name, name}

diff --git a/lib/gnutls_errors.h b/lib/errors.h
similarity index 98%
rename from lib/gnutls_errors.h
rename to lib/errors.h
index a810834fb4a53d0ae5fe0dd64ea0d341567c40ca..4335ec27db2c26bb8d837cb777e3aeaa873b1838 100644 (file)
--- a/lib/gnutls_errors.h
+++ b/lib/errors.h
@@ -23,8 +23,9 @@
 #ifndef GNUTLS_ERRORS_H
 #define GNUTLS_ERRORS_H
 
-#include <gnutls_int.h>
-#include <gnutls_global.h>
+#include "gnutls_int.h"
+#include <global.h>
+#include <mpi.h>
 
 #define GNUTLS_E_INT_RET_0 -1251
 #define GNUTLS_E_INT_CHECK_AGAIN -1252

diff --git a/lib/ext/alpn.c b/lib/ext/alpn.c
index 9fc946582e942162acb7aa65d57af856edf8f207..96d3cf0dc75f490337d17f4aec2b80ea1858dfaa 100644 (file)
--- a/lib/ext/alpn.c
+++ b/lib/ext/alpn.c
@@ -19,9 +19,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/alpn.h>
 
 static int _gnutls_alpn_recv_params(gnutls_session_t session,

diff --git a/lib/ext/alpn.h b/lib/ext/alpn.h
index 739879a2d1c35fa0a33f2195f4ff9d2667206d1a..b79ecdd9616514d42f79d5a0a179e7b88b01c646 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 #define MAX_ALPN_PROTOCOLS 8
 #define MAX_ALPN_PROTOCOL_NAME 32

diff --git a/lib/ext/cert_type.c b/lib/ext/cert_type.c
index f9f5e8ab934de30e8f73c1305c5e29cd58f2fdd8..408ac077649acc157943a34e65bfc00925398bed 100644 (file)
--- a/lib/ext/cert_type.c
+++ b/lib/ext/cert_type.c
@@ -25,11 +25,11 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/cert_type.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 
 #ifdef ENABLE_OPENPGP
 

diff --git a/lib/ext/cert_type.h b/lib/ext/cert_type.h
index 0eb521a44739e7244254f85167dc071f7bf5f6d3..b78cc13adc2dfc9f22b3a97d6c5bff34934a16c1 100644 (file)
--- a/lib/ext/cert_type.h
+++ b/lib/ext/cert_type.h
@@ -23,7 +23,7 @@
 #ifndef EXT_CERT_TYPE_H
 #define EXT_CERT_TYPE_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_cert_type;
 

diff --git a/lib/ext/dumbfw.c b/lib/ext/dumbfw.c
index 0a66f1a994eb34b6c2368021452866dbba9ab238..b4c850e2128b5d4e80a077005e2d3348df58c207 100644 (file)
--- a/lib/ext/dumbfw.c
+++ b/lib/ext/dumbfw.c
@@ -19,9 +19,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/dumbfw.h>
 
 /* This extension adds additional padding data in the TLS client hello.

diff --git a/lib/ext/dumbfw.h b/lib/ext/dumbfw.h
index bf0a49f9d744a29eb03f8dbb798f868d36eacd6f..e6a14fc8868797f9086819e3929b5f1c8011959a 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_dumbfw;
 

diff --git a/lib/ext/ecc.c b/lib/ext/ecc.c
index 68b3f8954277e2f51d1a4dc27f0c1ae44717a5ac..2d785353cb6171c8f973056387d32411320f0958 100644 (file)
--- a/lib/ext/ecc.c
+++ b/lib/ext/ecc.c
@@ -25,11 +25,11 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/ecc.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 #include <algorithms.h>
 
 static int _gnutls_supported_ecc_recv_params(gnutls_session_t session,

diff --git a/lib/ext/ecc.h b/lib/ext/ecc.h
index 268ca8e1f868e9a953ffe5340a989e8d6f6a902a..357fa87c4df17c76dc083e1cc6186e47eb532564 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_supported_ecc;
 extern extension_entry_st ext_mod_supported_ecc_pf;

diff --git a/lib/ext/etm.c b/lib/ext/etm.c
index d77db63eb1dc0d90b937b766407b2dab7c89972d..69474ddd60f2aea642b8a365afa6f231b95b5786 100644 (file)
--- a/lib/ext/etm.c
+++ b/lib/ext/etm.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.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 23a35a6d9b23e6c57c09c2f06f05a144f1c2830f..fcbf94751d37405965ba9ef1d7647ea0d07d74cd 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_etm;
 

diff --git a/lib/ext/ext_master_secret.c b/lib/ext/ext_master_secret.c
index 9610f1207b687fb0f88ad72359f27db670317aaa..30b26d3864cbd88c3de40d9ea8273fc8758ad9ab 100644 (file)
--- a/lib/ext/ext_master_secret.c
+++ b/lib/ext/ext_master_secret.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.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 2cdb29538b28159d4b9cbc932898c310088a539f..12f07fb66b478fa7a953a21ef5c6676dc2db0074 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_ext_master_secret;
 

diff --git a/lib/ext/heartbeat.c b/lib/ext/heartbeat.c
index f847a53f96885f6eb2fc3382bd15eee02db02b7c..e137f7e1a88ae0358d450d35a9e4ac21ec1479b8 100644 (file)
--- a/lib/ext/heartbeat.c
+++ b/lib/ext/heartbeat.c
@@ -26,12 +26,12 @@
  * and later rewritten by Nikos Mavrogiannopoulos.
  */
 
-#include <gnutls_errors.h>
-#include <gnutls_int.h>
-#include <gnutls_dtls.h>
-#include <gnutls_record.h>
+#include "errors.h"
+#include "gnutls_int.h"
+#include <dtls.h>
+#include <record.h>
 #include <ext/heartbeat.h>
-#include <gnutls_extensions.h>
+#include <extensions.h>
 #include <random.h>
 
 #ifdef ENABLE_HEARTBEAT

diff --git a/lib/ext/heartbeat.h b/lib/ext/heartbeat.h
index ceb09bb73726b1c9b23ece44746280e9bf9bbe41..5851435293cd04c371eaf746d5dc7c7328ae2292 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 #define HEARTBEAT_REQUEST 1
 #define HEARTBEAT_RESPONSE 2

diff --git a/lib/ext/max_record.c b/lib/ext/max_record.c
index cd636ea2efda8af8afa9bf7e869d94eaa7ffa51f..607222680caad16a01e27fd80d07383415788293 100644 (file)
--- a/lib/ext/max_record.c
+++ b/lib/ext/max_record.c
@@ -24,9 +24,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include "num.h"
+#include <extensions.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 82c7ab7bc43c0861ede47ad310bd62edd6f63a10..536b9da749f86e91a67a61af6308965a04f66515 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_max_record_size;
 

diff --git a/lib/ext/safe_renegotiation.c b/lib/ext/safe_renegotiation.c
index ea8208c508676d9b117a3b56bc902c6e11dfc001..3bc0bf363f1874bc5c67cb5dcc001bffa16ada13 100644 (file)
--- a/lib/ext/safe_renegotiation.c
+++ b/lib/ext/safe_renegotiation.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <ext/safe_renegotiation.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 
 
 static int _gnutls_sr_recv_params(gnutls_session_t state,

diff --git a/lib/ext/safe_renegotiation.h b/lib/ext/safe_renegotiation.h
index cd334158a3ffc783dbcb3d912890fc3dee86f8a7..52e3fcd7333afeba9d51265dcd219a4f97794e45 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 typedef struct {
        uint8_t client_verify_data[MAX_VERIFY_DATA_SIZE];

diff --git a/lib/ext/server_name.c b/lib/ext/server_name.c
index 2dd86930da536444abda21e4f6d7742a2fabac81..800f4de8f9d667015b091ba44db663ff6a6c73b2 100644 (file)
--- a/lib/ext/server_name.c
+++ b/lib/ext/server_name.c
@@ -21,9 +21,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/server_name.h>
 #ifdef HAVE_LIBIDN
 # include <idna.h>

diff --git a/lib/ext/server_name.h b/lib/ext/server_name.h
index fbc52177dc4dea617e1e7703447030695bc3652d..f25d28051f555da234e675b0b0c52a9070bf7e13 100644 (file)
--- a/lib/ext/server_name.h
+++ b/lib/ext/server_name.h
@@ -22,7 +22,7 @@
 #ifndef EXT_SERVER_NAME_H
 #define EXT_SERVER_NAME_H
 
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 typedef struct {
        uint8_t name[MAX_SERVER_NAME_SIZE];

diff --git a/lib/ext/session_ticket.c b/lib/ext/session_ticket.c
index 585544b4ebf05e5786dde35bad59d12b085b2fdc..799f009ed930d26312a248861d95bfe8c1e61317 100644 (file)
--- a/lib/ext/session_ticket.c
+++ b/lib/ext/session_ticket.c
@@ -20,20 +20,20 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <datum.h>
 #include <algorithms.h>
-#include <gnutls_handshake.h>
-#include <gnutls_num.h>
-#include <gnutls_constate.h>
-#include <gnutls_session_pack.h>
+#include <handshake.h>
+#include <num.h>
+#include <constate.h>
+#include <session_pack.h>
 #include <random.h>
 #include <ext/session_ticket.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_extensions.h>
-#include <gnutls_constate.h>
-#include <gnutls_dtls.h>
+#include <mbuffers.h>
+#include <extensions.h>
+#include <constate.h>
+#include <dtls.h>
 
 #ifdef ENABLE_SESSION_TICKETS
 

diff --git a/lib/ext/session_ticket.h b/lib/ext/session_ticket.h
index 8c76a7a27100c0fc18ed7751e6faea0ea0b0706b..3bb90f875a52fea02a8ecaa80075bbf071bbcbfe 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_session_ticket;
 

diff --git a/lib/ext/signature.c b/lib/ext/signature.c
index 3e2fa2be37d457742df3490651f2dc9e229048ac..03dd4a07da4ec21119f28db2c562c3bece637276 100644 (file)
--- a/lib/ext/signature.c
+++ b/lib/ext/signature.c
@@ -25,12 +25,12 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "errors.h"
+#include "num.h"
 #include <gnutls/gnutls.h>
 #include <ext/signature.h>
-#include <gnutls_state.h>
-#include <gnutls_num.h>
+#include <state.h>
+#include <num.h>
 #include <algorithms.h>
 #include <abstract_int.h>
 

diff --git a/lib/ext/signature.h b/lib/ext/signature.h
index 93858ef725ddd5004e6c72f1852389e8cd957434..ad2815a51c6fdc4755ccf01abaf8492f0f2532c7 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_sig;
 

diff --git a/lib/ext/srp.c b/lib/ext/srp.c
index ca9baaeddc1624e207f5bb9ee1ea24f606397959..cd1b54fe93725fabeac3ec87484825eb101a8c56 100644 (file)
--- a/lib/ext/srp.c
+++ b/lib/ext/srp.c
@@ -20,17 +20,17 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <ext/srp.h>
 
 #ifdef ENABLE_SRP
 
-#include "gnutls_auth.h"
-#include <auth/srp.h>
-#include "gnutls_errors.h"
+#include "auth.h"
+#include <auth/srp_kx.h>
+#include "errors.h"
 #include "algorithms.h"
-#include <gnutls_num.h>
-#include <gnutls_extensions.h>
+#include <num.h>
+#include <extensions.h>
 
 static int _gnutls_srp_unpack(gnutls_buffer_st * ps,
                              extension_priv_data_t * _priv);

diff --git a/lib/ext/srp.h b/lib/ext/srp.h
index 77e275dfc1e766e642ee483ec0ea6d829451a1e2..ae9a03c1a4e76d8b65f8970259c961c0ba4a4300 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 #ifdef ENABLE_SRP
 

diff --git a/lib/ext/srtp.c b/lib/ext/srtp.c
index 23bdc54ca054da527b3094874b839996f1f4e166..0f5d3c0ff8337bd1e88bbf71c2626a1e5dbe59e0 100644 (file)
--- a/lib/ext/srtp.c
+++ b/lib/ext/srtp.c
@@ -21,9 +21,9 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_auth.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "auth.h"
+#include "errors.h"
+#include "num.h"
 #include <ext/srtp.h>
 
 static int _gnutls_srtp_recv_params(gnutls_session_t session,

diff --git a/lib/ext/srtp.h b/lib/ext/srtp.h
index 46ecfd7f02eddfc172a648b52d8b2df37d5e4e43..bed8fc3963e4dbdca6e3bc34bdd305abb91152fe 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 #define MAX_SRTP_PROFILES 4
 

diff --git a/lib/ext/status_request.c b/lib/ext/status_request.c
index 4209f42ea04abba6b6d94d2767005da62f5ef4ab..e3226b2dd7d66f99f2f4803d745aa23a7a5a0a54 100644 (file)
--- a/lib/ext/status_request.c
+++ b/lib/ext/status_request.c
@@ -26,13 +26,13 @@
 */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include <gnutls_extensions.h>
+#include "errors.h"
+#include <extensions.h>
 #include <ext/status_request.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_auth.h>
+#include <mbuffers.h>
+#include <auth.h>
 #include <auth/cert.h>
-#include <gnutls_handshake.h>
+#include <handshake.h>
 
 #ifdef ENABLE_OCSP
 

diff --git a/lib/ext/status_request.h b/lib/ext/status_request.h
index cd1aaeea466ce6018e8ec21f9216cb45212aadc8..604c39248ee831b6efa308fa5363c89c6a1e2b17 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 <gnutls_extensions.h>
+#include <extensions.h>
 
 extern extension_entry_st ext_mod_status_request;
 

diff --git a/lib/gnutls_extensions.c b/lib/extensions.c
similarity index 99%
rename from lib/gnutls_extensions.c
rename to lib/extensions.c
index fece34995ecb8e0bd2459e3d92a096471b327b54..1e0aae59986f87daee3cf28b02f45b47a3b174c4 100644 (file)
--- a/lib/gnutls_extensions.c
+++ b/lib/extensions.c
@@ -26,8 +26,8 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_extensions.h"
-#include "gnutls_errors.h"
+#include "extensions.h"
+#include "errors.h"
 #include "ext/max_record.h"
 #include <ext/cert_type.h>
 #include <ext/server_name.h>
@@ -44,7 +44,7 @@
 #include <ext/alpn.h>
 #include <ext/dumbfw.h>
 #include <ext/etm.h>
-#include <gnutls_num.h>
+#include <num.h>
 
 
 static int ext_register(extension_entry_st * mod);

diff --git a/lib/gnutls_extensions.h b/lib/extensions.h
similarity index 100%
rename from lib/gnutls_extensions.h
rename to lib/extensions.h

diff --git a/lib/extras/randomart.c b/lib/extras/randomart.c
index 37e6c691297d883a4c41542958696241f8923ac2..cfd7e1c9db8f249ea3f42d4d8421f62c92858049 100644 (file)
--- a/lib/extras/randomart.c
+++ b/lib/extras/randomart.c
@@ -24,8 +24,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <randomart.h>
 
 /*

diff --git a/lib/fips.c b/lib/fips.c
index 4233485e4ce3316b8b87881fb8911d87c25ae691..54a706c27abd126e87c0b1591c74a366cf367fb4 100644 (file)
--- a/lib/fips.c
+++ b/lib/fips.c
@@ -19,11 +19,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <unistd.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <fips.h>
 #include <gnutls/self-test.h>
 #include <stdio.h>

diff --git a/lib/fips.h b/lib/fips.h
index f7fc7f62530c1ba6f020cd9e471f435a7087932e..23c3c9e2bc090fec41f97246ad661563062dd246 100644 (file)
--- a/lib/fips.h
+++ b/lib/fips.h
@@ -23,7 +23,7 @@
 #ifndef FIPS_H
 # define FIPS_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/gnutls.h>
 
 #define FIPS140_RND_KEY_SIZE 32

diff --git a/lib/gnutls_global.c b/lib/global.c
similarity index 98%
rename from lib/gnutls_global.c
rename to lib/global.c
index e8374aa2b36f7c0b6b3e303196ef37ea20c229b8..ee33a5178bb11c9472b4c8c4dc4605d46a40ee84 100644 (file)
--- a/lib/gnutls_global.c
+++ b/lib/global.c
@@ -20,15 +20,15 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_dh.h>
+#include <dh.h>
 #include <random.h>
 #include <gnutls/pkcs11.h>
 
-#include <gnutls_extensions.h> /* for _gnutls_ext_init */
-#include <gnutls_supplemental.h> /* for _gnutls_supplemental_deinit */
+#include <extensions.h>        /* for _gnutls_ext_init */
+#include <supplemental.h> /* for _gnutls_supplemental_deinit */
 #include <locks.h>
 #include <system.h>
 #include <accelerated/cryptodev.h>
@@ -36,7 +36,7 @@
 #include <fips.h>
 #include <atfork.h>
 #include <system-keys.h>
-#include <gnutls_str.h>
+#include "str.h"
 
 /* Minimum library versions we accept. */
 #define GNUTLS_MIN_LIBTASN1_VERSION "0.3.4"

diff --git a/lib/gnutls_global.h b/lib/global.h
similarity index 100%
rename from lib/gnutls_global.h
rename to lib/global.h

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 848acfec866b55e48072489d21b571e458406f4a..2846fa96104b87a94426b4a246a623e2b333d07d 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -194,7 +194,7 @@ typedef enum record_flush_t {
 #define DEFAULT_MAX_VERIFY_BITS 16*1024
 #define MAX_VERIFY_DEPTH 4096
 
-#include <gnutls_mem.h>
+#include <mem.h>
 
 #define MEMSUB(x,y) ((ssize_t)((ptrdiff_t)x-(ptrdiff_t)y))
 
@@ -214,7 +214,7 @@ typedef struct {
        uint8_t pint[3];
 } uint24;
 
-#include <gnutls_mpi.h>
+#include <mpi.h>
 
 typedef enum handshake_state_t { STATE0 = 0, STATE1, STATE2,
        STATE3, STATE4, STATE5, STATE6, STATE7, STATE8,
@@ -236,7 +236,7 @@ typedef enum recv_state_t {
        RECV_STATE_DTLS_RETRANSMIT,
 } recv_state_t;
 
-#include <gnutls_str.h>
+#include "str.h"
 
 /* This is the maximum number of algorithms (ciphers or macs etc).
  * keep it synced with GNUTLS_MAX_ALGORITHM_NUM in gnutls.h
@@ -495,9 +495,9 @@ typedef struct {
 
 /* STATE (cont) */
 
-#include <gnutls_hash_int.h>
-#include <gnutls_cipher_int.h>
-#include <gnutls_compress.h>
+#include <hash_int.h>
+#include <cipher_int.h>
+#include <compress.h>
 
 typedef struct {
        uint8_t hash_algorithm;

diff --git a/lib/gnutls_handshake.c b/lib/handshake.c
similarity index 99%
rename from lib/gnutls_handshake.c
rename to lib/handshake.c
index 3a2631f92103c1d89269d4341c94d75cbb37ecc6..3ea25bc81fe4ba765c33573771c23b0823226791 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/handshake.c
@@ -24,27 +24,27 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
+#include "errors.h"
+#include "dh.h"
 #include "debug.h"
 #include "algorithms.h"
-#include "gnutls_compress.h"
-#include "gnutls_cipher.h"
-#include "gnutls_buffers.h"
-#include "gnutls_mbuffers.h"
-#include "gnutls_kx.h"
-#include "gnutls_handshake.h"
-#include "gnutls_num.h"
-#include "gnutls_hash_int.h"
-#include "gnutls_db.h"
-#include "gnutls_extensions.h"
-#include "gnutls_supplemental.h"
-#include "gnutls_auth.h"
-#include "gnutls_v2_compat.h"
+#include "compress.h"
+#include "cipher.h"
+#include "buffers.h"
+#include "mbuffers.h"
+#include "kx.h"
+#include "handshake.h"
+#include "num.h"
+#include "hash_int.h"
+#include "db.h"
+#include "extensions.h"
+#include "supplemental.h"
+#include "auth.h"
+#include "sslv2_compat.h"
 #include <auth/cert.h>
-#include "gnutls_constate.h"
-#include <gnutls_record.h>
-#include <gnutls_state.h>
+#include "constate.h"
+#include <record.h>
+#include <state.h>
 #include <ext/srp.h>
 #include <ext/session_ticket.h>
 #include <ext/status_request.h>
@@ -52,7 +52,7 @@
 #include <auth/anon.h>         /* for gnutls_anon_server_credentials_t */
 #include <auth/psk.h>          /* for gnutls_psk_server_credentials_t */
 #include <random.h>
-#include <gnutls_dtls.h>
+#include <dtls.h>
 
 #ifdef HANDSHAKE_DEBUG
 #define ERR(x, y) _gnutls_handshake_log("HSK[%p]: %s (%d)\n", session, x,y)

diff --git a/lib/gnutls_handshake.h b/lib/handshake.h
similarity index 99%
rename from lib/gnutls_handshake.h
rename to lib/handshake.h
index 65b190238d1da6e0c884507a697e474ba088b964..3387b3c7da459677cdecd86c3bf6ade3ce918ac2 100644 (file)
--- a/lib/gnutls_handshake.h
+++ b/lib/handshake.h
@@ -23,7 +23,7 @@
 #ifndef HANDSHAKE_H
 #define HANDSHAKE_H
 
-#include <gnutls_errors.h>
+#include "errors.h"
 
 int _gnutls_send_handshake(gnutls_session_t session, mbuffer_st * bufel,
                           gnutls_handshake_description_t type);

diff --git a/lib/gnutls_hash_int.c b/lib/hash_int.c
similarity index 99%
rename from lib/gnutls_hash_int.c
rename to lib/hash_int.c
index 39b04780a0a6f3394cd35ed4fb4b41306118d05a..5201a168434d52e108410c8380ce092a6784da41 100644 (file)
--- a/lib/gnutls_hash_int.c
+++ b/lib/hash_int.c
@@ -24,9 +24,9 @@
  * and HMACs.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_hash_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <hash_int.h>
+#include "errors.h"
 #include <algorithms.h>
 #include <fips.h>
 

diff --git a/lib/gnutls_hash_int.h b/lib/hash_int.h
similarity index 99%
rename from lib/gnutls_hash_int.h
rename to lib/hash_int.h
index 2e00b8c495182479c8555bcd00f00e6c4fe62bab..9ebd3fce2b94f1110a536fdbd8c48527bdfba1f0 100644 (file)
--- a/lib/gnutls_hash_int.h
+++ b/lib/hash_int.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_HASH_INT_H
 #define GNUTLS_HASH_INT_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/crypto.h>
 #include <crypto-backend.h>
 #include <crypto.h>

diff --git a/lib/gnutls_helper.c b/lib/helper.c
similarity index 94%
rename from lib/gnutls_helper.c
rename to lib/helper.c
index d647fe332701cf6a3fb5e2458da69f9923f98d09..9bdb35115d5c74558867d25bcd7aeac32afb86a5 100644 (file)
--- a/lib/gnutls_helper.c
+++ b/lib/helper.c
@@ -20,8 +20,8 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_helper.h>
+#include "gnutls_int.h"
+#include <helper.h>
 
 int _gnutls_file_exists(const char *file)
 {

diff --git a/lib/gnutls_helper.h b/lib/helper.h
similarity index 100%
rename from lib/gnutls_helper.h
rename to lib/helper.h

diff --git a/lib/gnutls_kx.c b/lib/kx.c
similarity index 98%
rename from lib/gnutls_kx.c
rename to lib/kx.c
index d02d42d271adef0915cbd6445d4a04952beb9e22..2c9197a4fcacdee23f99e97b2ffa974113d59624 100644 (file)
--- a/lib/gnutls_kx.c
+++ b/lib/kx.c
@@ -25,16 +25,16 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_handshake.h"
-#include "gnutls_kx.h"
-#include "gnutls_dh.h"
-#include "gnutls_errors.h"
+#include "handshake.h"
+#include "kx.h"
+#include "dh.h"
+#include "errors.h"
 #include "algorithms.h"
 #include "debug.h"
-#include "gnutls_mpi.h"
-#include <gnutls_state.h>
-#include <gnutls_datum.h>
-#include <gnutls_mbuffers.h>
+#include "mpi.h"
+#include <state.h>
+#include <datum.h>
+#include <mbuffers.h>
 
 /* This is a temporary function to be used before the generate_*
    internal API is changed to use mbuffers. For now we don't avoid the

diff --git a/lib/gnutls_kx.h b/lib/kx.h
similarity index 100%
rename from lib/gnutls_kx.h
rename to lib/kx.h

diff --git a/lib/locks.c b/lib/locks.c
index e2acc7961828ad414feddbb57e803bb6c223b745..d632e0e3c9a975d94b92a6de9be600c0e4b2c050 100644 (file)
--- a/lib/locks.c
+++ b/lib/locks.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_dh.h>
+#include <dh.h>
 #include <random.h>
 
 #include <locks.h>

diff --git a/lib/locks.h b/lib/locks.h
index d046341ea4f01e36f5bbf05a24666683b8fd8c37..58077545e0240ede11e79b66edff8b80cebeb64c 100644 (file)
--- a/lib/locks.h
+++ b/lib/locks.h
@@ -24,7 +24,7 @@
 #define GNUTLS_LOCKS_H
 
 #include <gnutls/gnutls.h>
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <system.h>
 
 extern mutex_init_func gnutls_mutex_init;

diff --git a/lib/gnutls_mbuffers.c b/lib/mbuffers.c
similarity index 99%
rename from lib/gnutls_mbuffers.c
rename to lib/mbuffers.c
index c8fe95a02470b5f1c0391a9c54e2ac75cbcba46e..2bcd57e4262ed405a3d18a2203e52d171f8d6bee 100644 (file)
--- a/lib/gnutls_mbuffers.c
+++ b/lib/mbuffers.c
@@ -20,8 +20,8 @@
  *
  */
 
-#include "gnutls_mbuffers.h"
-#include "gnutls_errors.h"
+#include "mbuffers.h"
+#include "errors.h"
 
 /* Here be mbuffers */
 

diff --git a/lib/gnutls_mbuffers.h b/lib/mbuffers.h
similarity index 98%
rename from lib/gnutls_mbuffers.h
rename to lib/mbuffers.h
index e48353da97905f4e08e05ebc93ec502d521001b5..4c68b55f98894db0247890b3bc7e8b783082510f 100644 (file)
--- a/lib/gnutls_mbuffers.h
+++ b/lib/mbuffers.h
@@ -23,8 +23,8 @@
 #ifndef GNUTLS_MBUFFERS_H
 #define GNUTLS_MBUFFERS_H
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 
 void _mbuffer_head_init(mbuffer_head_st * buf);
 void _mbuffer_head_clear(mbuffer_head_st * buf);

diff --git a/lib/gnutls_mem.c b/lib/mem.c
similarity index 97%
rename from lib/gnutls_mem.c
rename to lib/mem.c
index b4b49ddd451bef74fa64b0744baf19fc5c6e1b9f..2f4fc93f344bc48d45a020bf78d02d5ee84fc4c4 100644 (file)
--- a/lib/gnutls_mem.c
+++ b/lib/mem.c
@@ -20,9 +20,9 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
 #include <xsize.h>
 
 gnutls_alloc_function gnutls_secure_malloc = malloc;

diff --git a/lib/gnutls_mem.h b/lib/mem.h
similarity index 100%
rename from lib/gnutls_mem.h
rename to lib/mem.h

diff --git a/lib/gnutls_mpi.c b/lib/mpi.c
similarity index 98%
rename from lib/gnutls_mpi.c
rename to lib/mpi.c
index 9348b5905ea25d488586d09b1520c178a0543262..828a0b8dad70668fa089b8dfbe3a059d101ca787 100644 (file)
--- a/lib/gnutls_mpi.c
+++ b/lib/mpi.c
@@ -24,11 +24,11 @@
  * other stuff that didn't fit anywhere else.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_mpi.h>
+#include "errors.h"
+#include <num.h>
+#include <mpi.h>
 #include <random.h>
 #include <x509/x509_int.h>
 

diff --git a/lib/gnutls_mpi.h b/lib/mpi.h
similarity index 99%
rename from lib/gnutls_mpi.h
rename to lib/mpi.h
index 23eee6637fd355ff020292b872211713571b9dbe..c7533673acc230ce06d7eb90c075bfd2c20e65c4 100644 (file)
--- a/lib/gnutls_mpi.h
+++ b/lib/mpi.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_MPI_H
 #define GNUTLS_MPI_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #include <crypto-backend.h>
 

diff --git a/lib/nettle/cipher.c b/lib/nettle/cipher.c
index 74e42031c6e7736be15aaa634636aaaad73bb6ed..0bf94fc69484f88a92657d724705f4a76d3dc382 100644 (file)
--- a/lib/nettle/cipher.c
+++ b/lib/nettle/cipher.c
@@ -24,9 +24,9 @@
 /* Here lie nettle's wrappers for cipher support.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_cipher_int.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <cipher_int.h>
 #include <nettle/aes.h>
 #include <nettle/camellia.h>
 #include <nettle/arcfour.h>

diff --git a/lib/nettle/egd.c b/lib/nettle/egd.c
index 051ee2b5d57f5ab91646d406b49dc02de076b162..ae51901d2fb4c2e0ced64bd039394176462b2412 100644 (file)
--- a/lib/nettle/egd.c
+++ b/lib/nettle/egd.c
@@ -33,9 +33,9 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "egd.h"
-#include <gnutls_int.h>
-#include <gnutls_str.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <str.h>
+#include "errors.h"
 
 #ifdef AF_UNIX
 #define LOCAL_SOCKET_TYPE AF_UNIX

diff --git a/lib/nettle/init.c b/lib/nettle/init.c
index 4f7585940319c579a0ec6e60484208b2402114d0..c2d488e74391c57b30cfda5b2055ffa962ddbf9c 100644 (file)
--- a/lib/nettle/init.c
+++ b/lib/nettle/init.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_mpi.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
+#include <mpi.h>
 
 /* Functions that refer to the initialization of the nettle library.
  */

diff --git a/lib/nettle/int/drbg-aes-self-test.c b/lib/nettle/int/drbg-aes-self-test.c
index eb62cf0a4d77fb067f2df34bd96d86a96d971091..c4547a6665c98ac786e86e58d8cd63c1cfb58386 100644 (file)
--- a/lib/nettle/int/drbg-aes-self-test.c
+++ b/lib/nettle/int/drbg-aes-self-test.c
@@ -21,7 +21,7 @@
  */
 
 #include <config.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <drbg-aes.h>
 #include <string.h>
 #include <stdio.h>

diff --git a/lib/nettle/mac.c b/lib/nettle/mac.c
index cfa37e34798dc0fe6ac332cd6835beade1b71893..eafba8fcc3ab9448567f00b5af7629f2d652b20a 100644 (file)
--- a/lib/nettle/mac.c
+++ b/lib/nettle/mac.c
@@ -23,9 +23,9 @@
 /* This file provides the backend hash/mac API for nettle.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_hash_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <hash_int.h>
+#include "errors.h"
 #include <nettle/md5.h>
 #include <nettle/md2.h>
 #include <nettle/sha.h>

diff --git a/lib/nettle/mpi.c b/lib/nettle/mpi.c
index 1324263e7c71240d5d2afa310572de13e4f7cafe..61fddfb7e0bc778d92fd827d1cc06425df8d41df 100644 (file)
--- a/lib/nettle/mpi.c
+++ b/lib/nettle/mpi.c
@@ -23,11 +23,11 @@
 /* Here lie everything that has to do with large numbers, gmp.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <algorithms.h>
-#include <gnutls_num.h>
-#include <gnutls_mpi.h>
+#include <num.h>
+#include <mpi.h>
 #include <nettle/bignum.h> /* includes gmp.h */
 #include <gnettle.h>
 #include <random.h>

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 2fba4de3a79384ee7e28db2e4c05ee0ca394cea4..98621ec87b83e506f6ac01fbef468c2bc461cee6 100644 (file)
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -25,18 +25,18 @@
  * encryption and signatures. 
  */
 
-#include <gnutls_int.h>
-#include <gnutls_mpi.h>
-#include <gnutls_pk.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_sig.h>
-#include <gnutls_num.h>
+#include "gnutls_int.h"
+#include <mpi.h>
+#include <pk.h>
+#include "errors.h"
+#include <datum.h>
+#include <global.h>
+#include <tls-sig.h>
+#include <num.h>
 #include <x509/x509_int.h>
 #include <x509/common.h>
 #include <random.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <nettle/dsa.h>
 #ifdef ENABLE_FIPS140
 # include <dsa-fips.h>

diff --git a/lib/nettle/rnd-common.c b/lib/nettle/rnd-common.c
index c69ff3bdbb43322a146500dcb9ec3a65e0213805..680126033af76be424e73c68be092bbb8f24fe71 100644 (file)
--- a/lib/nettle/rnd-common.c
+++ b/lib/nettle/rnd-common.c
@@ -28,10 +28,10 @@
  * Original author Niels Möller.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <locks.h>
-#include <gnutls_num.h>
+#include <num.h>
 #include <nettle/yarrow.h>
 #include <errno.h>
 #include <rnd-common.h>

diff --git a/lib/nettle/rnd-common.h b/lib/nettle/rnd-common.h
index f6354793c955132d982faa3f1ce1ecc3470079a1..3ffb4a9bb00c68299c2ef643b6be384dac6f5d56 100644 (file)
--- a/lib/nettle/rnd-common.h
+++ b/lib/nettle/rnd-common.h
@@ -21,7 +21,7 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #ifdef HAVE_GETPID
 # include <unistd.h>           /* getpid */
 #endif

diff --git a/lib/nettle/rnd-fips.c b/lib/nettle/rnd-fips.c
index 8e31f73895a9bbec472291bbd5c33c72a5afa836..ef64649c8f5a472c20cc8b43fb8f1e086c4e268b 100644 (file)
--- a/lib/nettle/rnd-fips.c
+++ b/lib/nettle/rnd-fips.c
@@ -25,8 +25,8 @@
 #include <drbg-aes.h>
 #include <fips.h>
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <nettle/aes.h>
 #include <nettle/memxor.h>
 #include <locks.h>

diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index 8ac30a8d95fe9fedf11a63612d78137328426951..8a5a76286c81dd1f524c0901d05ec15945e4f4f8 100644 (file)
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -27,10 +27,10 @@
  * Original author Niels Möller.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <locks.h>
-#include <gnutls_num.h>
+#include <num.h>
 #include <nettle/yarrow.h>
 #include <nettle/salsa20.h>
 #include <rnd-common.h>

diff --git a/lib/gnutls_num.c b/lib/num.c
similarity index 95%
rename from lib/gnutls_num.c
rename to lib/num.c
index e9a7487917656b70c5e35673663bc26a2da7106b..4169720b0bf1f4eeefa69f9c36dd02d9dbc37aa7 100644 (file)
--- a/lib/gnutls_num.c
+++ b/lib/num.c
@@ -24,9 +24,9 @@
  * TLS, and functions which ease the access to TLS vectors (data of given size).
  */
 
-#include <gnutls_int.h>
-#include <gnutls_num.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <num.h>
+#include "errors.h"
 
 /* This function will add one to uint64 x.
  * Returns 0 on success, or -1 if the uint64 max limit

diff --git a/lib/gnutls_num.h b/lib/num.h
similarity index 99%
rename from lib/gnutls_num.h
rename to lib/num.h
index 13d33ba9d753c72a0fcfb3d3881a3bd168a0f991..c491be735b6754305c1c6b019faf012b6da1fcc7 100644 (file)
--- a/lib/gnutls_num.h
+++ b/lib/num.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_NUM_H
 #define GNUTLS_NUM_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #include <minmax.h>
 #include <byteswap.h>

diff --git a/lib/opencdk/literal.c b/lib/opencdk/literal.c
index 7b4baec82f4805aeff08fe0ba8b6f4e98e8869e0..2c7b1b86a43dc45dce45623628aa5c662129b072 100644 (file)
--- a/lib/opencdk/literal.c
+++ b/lib/opencdk/literal.c
@@ -27,8 +27,8 @@
 #include <opencdk.h>
 #include <main.h>
 #include <filters.h>
-#include <gnutls_int.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include <str.h>
 
 
 /* Duplicate the string @s but strip of possible

diff --git a/lib/opencdk/misc.c b/lib/opencdk/misc.c
index 0d4ee891215f4c7bb8645d965ba8d76ec1a31707..3aab45573ed6d251817b0ae1d7a074449378013a 100644 (file)
--- a/lib/opencdk/misc.c
+++ b/lib/opencdk/misc.c
@@ -31,8 +31,8 @@
 #include <opencdk.h>
 #include <main.h>
 #include <random.h>
-#include <gnutls_int.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include <str.h>
 
 
 u32 _cdk_buftou32(const byte * buf)

diff --git a/lib/opencdk/opencdk.h b/lib/opencdk/opencdk.h
index c06b7498458e0e6e9aa697552e3ce07bd835d4a4..07bac6128dbabab04411de4dcedfa0fa900fe9fd 100644 (file)
--- a/lib/opencdk/opencdk.h
+++ b/lib/opencdk/opencdk.h
@@ -24,13 +24,13 @@
 #define OPENCDK_H
 
 #include <config.h>
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <stddef.h>            /* for size_t */
 #include <stdarg.h>
-#include <gnutls_mem.h>
+#include <mem.h>
 #include <gnutls/gnutls.h>
-#include <gnutls_errors.h>
-#include <gnutls_hash_int.h>
+#include "errors.h"
+#include <hash_int.h>
 
 /* The OpenCDK version as a string. */
 #define OPENCDK_VERSION "0.6.6"

diff --git a/lib/opencdk/pubkey.c b/lib/opencdk/pubkey.c
index 6e753bd2565d1bd345fe6902c9cc49108a8de10e..72e7d77b7ec6d86ef6bba328675ebfe34702ab39 100644 (file)
--- a/lib/opencdk/pubkey.c
+++ b/lib/opencdk/pubkey.c
@@ -23,10 +23,10 @@
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_pk.h>
-#include <gnutls_sig.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <pk.h>
+#include <tls-sig.h>
 #include <x509/common.h>
 #include "opencdk.h"
 #include "main.h"

diff --git a/lib/opencdk/read-packet.c b/lib/opencdk/read-packet.c
index 932c95ec41b7dc01571f77c578a43fd3583e1849..6956915820a4648ef6c0b8b950d580802e99c320 100644 (file)
--- a/lib/opencdk/read-packet.c
+++ b/lib/opencdk/read-packet.c
@@ -33,7 +33,7 @@
 #include "packet.h"
 #include "types.h"
 #include <algorithms.h>
-#include <gnutls_str.h>
+#include <str.h>
 #include <minmax.h>
 
 /* The version of the MDC packet considering the lastest OpenPGP draft. */

diff --git a/lib/opencdk/sig-check.c b/lib/opencdk/sig-check.c
index 931bb138cbad29d701597fe01d4e82d3b9634fa4..935895fc5fb02b5f554340b886a3603b40ea76aa 100644 (file)
--- a/lib/opencdk/sig-check.c
+++ b/lib/opencdk/sig-check.c
@@ -24,7 +24,7 @@
 #include <config.h>
 #endif
 #include <stdio.h>
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <algorithms.h>
 
 #include "opencdk.h"

diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 893f5966b0e631339bcf3fa60d9e8d90aacbc058..0522cec51a6d1762b67e5d41950928bdf8ecd655 100644 (file)
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -35,6 +35,6 @@ endif
 noinst_LTLIBRARIES = libgnutls_openpgp.la
 
 COBJECTS = pgp.c pgpverify.c extras.c compat.c privkey.c output.c      \
-       gnutls_openpgp.c
+       openpgp.c
 
 libgnutls_openpgp_la_SOURCES = $(COBJECTS) openpgp_int.h gnutls_openpgp.h

diff --git a/lib/openpgp/compat.c b/lib/openpgp/compat.c
index 4fae6714fdcc63bb2a856e5f188bcaa2a6ccc9cd..cf39024c7a2dda7ad7e431be2762b352213e783a 100644 (file)
--- a/lib/openpgp/compat.c
+++ b/lib/openpgp/compat.c
@@ -23,9 +23,9 @@
 /* Compatibility functions on OpenPGP key parsing.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_openpgp.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <openpgp.h>
 #include <openpgp_int.h>
 
 /*-

diff --git a/lib/openpgp/extras.c b/lib/openpgp/extras.c
index 114cae137293e7e28636ffeba10c39f57c993587..0e3dadd078bb08b88d657095411576511bd2625c 100644 (file)
--- a/lib/openpgp/extras.c
+++ b/lib/openpgp/extras.c
@@ -23,13 +23,13 @@
 /* Functions on keyring parsing
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <openpgp_int.h>
-#include <gnutls_openpgp.h>
-#include <gnutls_num.h>
+#include <openpgp.h>
+#include <num.h>
 
 /* Keyring stuff.
  */

diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/openpgp.c
similarity index 98%
rename from lib/openpgp/gnutls_openpgp.c
rename to lib/openpgp/openpgp.c
index 4c867960dc3c327f264ac1df24d04335b50d5322..d2f69335d884430645608522b2f1973a53fc0cfe 100644 (file)
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/openpgp.c
@@ -21,16 +21,16 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_mpi.h"
-#include "gnutls_num.h"
-#include "gnutls_datum.h"
-#include "gnutls_global.h"
-#include "gnutls_openpgp.h"
+#include "errors.h"
+#include "mpi.h"
+#include "num.h"
+#include "datum.h"
+#include "global.h"
+#include "openpgp.h"
 #include "read-file.h"
 #include <gnutls/abstract.h>
-#include <gnutls_str.h>
-#include <gnutls_sig.h>
+#include <str.h>
+#include <tls-sig.h>
 #include <stdio.h>
 #include <sys/stat.h>
 

diff --git a/lib/openpgp/gnutls_openpgp.h b/lib/openpgp/openpgp.h
similarity index 100%
rename from lib/openpgp/gnutls_openpgp.h
rename to lib/openpgp/openpgp.h

diff --git a/lib/openpgp/output.c b/lib/openpgp/output.c
index 8ed87f894e05b72bbd901d831ab960848019c09c..0995b8071d60ef3fedcdbe334ccf52503826a8a2 100644 (file)
--- a/lib/openpgp/output.c
+++ b/lib/openpgp/output.c
@@ -23,9 +23,9 @@
 /* Functions for printing X.509 Certificate structures
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/openpgp.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <extras/randomart.h>
 
 #define addf _gnutls_buffer_append_printf

diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index 1e37c81c2330e283fe471b073af88d1b15b12f45..dd6957e2478e09553f799cdfd07d70ab714eaf33 100644 (file)
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -23,13 +23,13 @@
 /* Functions on OpenPGP key parsing
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <openpgp_int.h>
-#include <gnutls_str.h>
-#include <gnutls_num.h>
+#include <str.h>
+#include <num.h>
 #include <x509/common.h>
 
 /**

diff --git a/lib/openpgp/pgpverify.c b/lib/openpgp/pgpverify.c
index b1748daf7efe2b0010691152e7276929a1ac911c..f9083507d80b3c9ed09d4fbfb0d06f2a01435615 100644 (file)
--- a/lib/openpgp/pgpverify.c
+++ b/lib/openpgp/pgpverify.c
@@ -23,11 +23,11 @@
 /* Functions on OpenPGP key parsing
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <openpgp_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_openpgp.h>
-#include <gnutls_num.h>
+#include "errors.h"
+#include <openpgp.h>
+#include <num.h>
 
 /**
  * gnutls_openpgp_crt_verify_ring:

diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index a9627f63f104c24128334f9faac024fedd93c357..5766a142bf45d2d843964b6931bc17bbe68c75ac 100644 (file)
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -23,15 +23,15 @@
 /* Functions on OpenPGP privkey parsing
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
+#include <num.h>
 #include <openpgp_int.h>
-#include <gnutls_openpgp.h>
-#include <gnutls_sig.h>
-#include <gnutls_pk.h>
+#include <openpgp.h>
+#include <tls-sig.h>
+#include <pk.h>
 
 /**
  * gnutls_openpgp_privkey_init:

diff --git a/lib/gnutls_pcert.c b/lib/pcert.c
similarity index 99%
rename from lib/gnutls_pcert.c
rename to lib/pcert.c
index 06088c865403541837ea7b29bedacaa36ff6d841..6127f182d5a4e5d7b6431a6556ed9586f050bc45 100644 (file)
--- a/lib/gnutls_pcert.c
+++ b/lib/pcert.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <auth/cert.h>
 #include <x509/common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include "x509/x509_int.h"
 #ifdef ENABLE_OPENPGP
-#include "openpgp/gnutls_openpgp.h"
+#include "openpgp/openpgp.h"
 #endif
 
 /**

diff --git a/lib/pin.c b/lib/pin.c
index 64edffb4c451f046e0feb3bb791434447ee3ab16..86903fd0b5fd92ae8ca68b328759cd2bb41ffe01 100644 (file)
--- a/lib/pin.c
+++ b/lib/pin.c
@@ -18,10 +18,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <pin.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 
 gnutls_pin_callback_t _gnutls_pin_func;
 void *_gnutls_pin_data;

diff --git a/lib/gnutls_pk.c b/lib/pk.c
similarity index 98%
rename from lib/gnutls_pk.c
rename to lib/pk.c
index 22a5133755393015d6a8ead327fdc401a016e0ed..60d1f78087ba074b52404b0c4f764c1e90affc8b 100644 (file)
--- a/lib/gnutls_pk.c
+++ b/lib/pk.c
@@ -24,13 +24,13 @@
  * encryption and signatures. 
  */
 
-#include <gnutls_int.h>
-#include <gnutls_mpi.h>
-#include <gnutls_pk.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>
+#include "gnutls_int.h"
+#include <mpi.h>
+#include <pk.h>
+#include "errors.h"
+#include <datum.h>
+#include <global.h>
+#include <num.h>
 #include "debug.h"
 #include <x509/x509_int.h>
 #include <x509/common.h>

diff --git a/lib/gnutls_pk.h b/lib/pk.h
similarity index 100%
rename from lib/gnutls_pk.h
rename to lib/pk.h

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 46351ab0343081074910921316d774343dc31d29..4500ac9b258cbd78b73a44952980d00681cf38c4 100644 (file)
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -25,11 +25,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <x509/common.h>
 #include <locks.h>
 

diff --git a/lib/pkcs11_int.c b/lib/pkcs11_int.c
index 848b8b94b048cd66fd1f31006d7f3df5167f3387..a2277b8823b89eb4f84bfe29461e1f87f12062ae 100644 (file)
--- a/lib/pkcs11_int.c
+++ b/lib/pkcs11_int.c
@@ -23,12 +23,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 
 #include <pin.h>
 #include <pkcs11_int.h>

diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c
index 5e4e5d20179dad45353bef26a4d9355c2413b5a9..3e61f50d964a6f66f6228dcb7ddbf62ef69dfab5 100644 (file)
--- a/lib/pkcs11_privkey.c
+++ b/lib/pkcs11_privkey.c
@@ -18,15 +18,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
-#include <gnutls_sig.h>
-#include <gnutls_pk.h>
+#include <tls-sig.h>
+#include <pk.h>
 #include <fips.h>
 #include "urls.h"
 #include <p11-kit/uri.h>

diff --git a/lib/pkcs11_secret.c b/lib/pkcs11_secret.c
index 0b90ee8993f01139e19031cfebf3cccbe73e2e67..a53763e7dc7afa409efc4ca61c0bc8005d3abf37 100644 (file)
--- a/lib/pkcs11_secret.c
+++ b/lib/pkcs11_secret.c
@@ -18,12 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
 #include <random.h>
 

diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c
index fe5f32ad0b6ce1b751361d3cb8d8b9197909ff90..7b949530c54e7eb90259bf0e00d7b5accf3fb236 100644 (file)
--- a/lib/pkcs11_write.c
+++ b/lib/pkcs11_write.c
@@ -18,12 +18,12 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
 #include "pkcs11x.h"
 #include <x509/common.h>

diff --git a/lib/pkcs11x.c b/lib/pkcs11x.c
index 9faaf9d3ceb21d2b63f24e7bd7ef33be37053ad3..ddffa8ee23156fbb6c401bc56774b4cb5ba77414 100644 (file)
--- a/lib/pkcs11x.c
+++ b/lib/pkcs11x.c
@@ -19,10 +19,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <global.h>
+#include "errors.h"
 #include "x509/common.h"
 
 #include <pkcs11_int.h>

diff --git a/lib/prf.c b/lib/prf.c
index 5b95511dc439c14ace3dece59f126209758929b6..a2cad25b7c4bb556925ae6342e93f2bf7b5c0608 100644 (file)
--- a/lib/prf.c
+++ b/lib/prf.c
@@ -24,10 +24,10 @@
 /* Functions for the TLS PRF handling.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_state.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
+#include <state.h>
 #include <algorithms.h>
 
 #define MAX_PRF_BYTES 200

diff --git a/lib/gnutls_priority.c b/lib/priority.c
similarity index 99%
rename from lib/gnutls_priority.c
rename to lib/priority.c
index 652da6722eab523cfc1a815cb1882e2768c5d227..ee158a5f13279297856689782613003e31a818c4 100644 (file)
--- a/lib/gnutls_priority.c
+++ b/lib/priority.c
@@ -25,11 +25,11 @@
 
 #include "gnutls_int.h"
 #include "algorithms.h"
-#include "gnutls_errors.h"
-#include <gnutls_num.h>
+#include "errors.h"
+#include <num.h>
 #include <gnutls/x509.h>
 #include <c-ctype.h>
-#include <gnutls_extensions.h>
+#include <extensions.h>
 
 #define MAX_ELEMENTS 64
 

diff --git a/lib/gnutls_privkey.c b/lib/privkey.c
similarity index 99%
rename from lib/gnutls_privkey.c
rename to lib/privkey.c
index 3312cdf8b8e884a8c0bc1cf7e92d0a9bf581778c..6394a9000ef69ac5e2e1466fbd7a1848fc269cbc 100644 (file)
--- a/lib/gnutls_privkey.c
+++ b/lib/privkey.c
@@ -19,19 +19,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
 #include <gnutls/abstract.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <x509_int.h>
 #include <openpgp/openpgp_int.h>
-#include <openpgp/gnutls_openpgp.h>
-#include <gnutls_sig.h>
+#include <openpgp/openpgp.h>
+#include <tls-sig.h>
 #include <algorithms.h>
 #include <fips.h>
 #include <system-keys.h>

diff --git a/lib/gnutls_privkey_raw.c b/lib/privkey_raw.c
similarity index 98%
rename from lib/gnutls_privkey_raw.c
rename to lib/privkey_raw.c
index 10ea3e012cc9081ee901a0915fd297675397cebd..47754831ee6b3df3227bd0536494fac37c31ab1f 100644 (file)
--- a/lib/gnutls_privkey_raw.c
+++ b/lib/privkey_raw.c
@@ -17,19 +17,19 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
 #include <gnutls/abstract.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <x509_int.h>
 #include <openpgp/openpgp_int.h>
-#include <openpgp/gnutls_openpgp.h>
-#include <gnutls_sig.h>
+#include <openpgp/openpgp.h>
+#include <tls-sig.h>
 #include <algorithms.h>
 #include <fips.h>
 #include <abstract_int.h>

diff --git a/lib/gnutls_psk.c b/lib/psk.c
similarity index 98%
rename from lib/gnutls_psk.c
rename to lib/psk.c
index aaa39de9caa231bfd447b0729804bb557329a48f..12956570231340429aa9090c9a52ba70b7828e75 100644 (file)
--- a/lib/gnutls_psk.c
+++ b/lib/psk.c
@@ -22,17 +22,17 @@
 
 /* Functions for manipulating the PSK credentials. */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <auth/psk.h>
-#include <gnutls_state.h>
+#include <state.h>
 
 #ifdef ENABLE_PSK
 
 #include <auth/psk_passwd.h>
-#include <gnutls_num.h>
-#include <gnutls_helper.h>
-#include <gnutls_datum.h>
+#include <num.h>
+#include <helper.h>
+#include <datum.h>
 #include "debug.h"
 
 /**

diff --git a/lib/gnutls_pubkey.c b/lib/pubkey.c
similarity index 99%
rename from lib/gnutls_pubkey.c
rename to lib/pubkey.c
index e461c14150c21dc2eb7e2be943d69b898d4b7e46..c686444fbd6e7e01c347657bf4f80147b47432a4 100644 (file)
--- a/lib/gnutls_pubkey.c
+++ b/lib/pubkey.c
@@ -18,25 +18,25 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <gnutls/pkcs11.h>
 #include <stdio.h>
 #include <string.h>
-#include <gnutls_errors.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <pkcs11_int.h>
 #include <gnutls/abstract.h>
-#include <gnutls_sig.h>
-#include <gnutls_pk.h>
+#include <tls-sig.h>
+#include <pk.h>
 #include <x509_int.h>
 #include <openpgp/openpgp_int.h>
-#include <gnutls_num.h>
+#include <num.h>
 #include <x509/common.h>
 #include <x509_b64.h>
 #include <abstract_int.h>
 #include <fips.h>
 #include "urls.h"
-#include <gnutls_ecc.h>
+#include <ecc.h>
 
 
 #define OPENPGP_KEY_PRIMARY 2

diff --git a/lib/random.c b/lib/random.c
index 89e882706974f5671413776779ce074b22043ddf..d7f18f2ce70870d5f265a27de328ab551c7fa254 100644 (file)
--- a/lib/random.c
+++ b/lib/random.c
@@ -23,8 +23,8 @@
 /* This file handles all the internal functions that cope with random data.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <random.h>
 #include <fips.h>
 

diff --git a/lib/gnutls_range.c b/lib/range.c
similarity index 99%
rename from lib/gnutls_range.c
rename to lib/range.c
index 488312d9c41fe7c90d6fb32acd55855d2cff355f..a29c3bfee1a1b663e840b90f66f79e9c418f491d 100644 (file)
--- a/lib/gnutls_range.c
+++ b/lib/range.c
@@ -21,10 +21,10 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include "algorithms.h"
-#include "gnutls_constate.h"
-#include "gnutls_record.h"
+#include "constate.h"
+#include "record.h"
 
 static void
 _gnutls_set_range(gnutls_range_st * dst, const size_t low,

diff --git a/lib/gnutls_record.c b/lib/record.c
similarity index 99%
rename from lib/gnutls_record.c
rename to lib/record.c
index d83bf098c42b97999ce8f43db7411a6152de67b8..51683e67cd57356b2f4c536fc6bc18e9e3c05d87 100644 (file)
--- a/lib/gnutls_record.c
+++ b/lib/record.c
@@ -30,27 +30,27 @@
 #define CIPHER_SLACK_SIZE 32
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include "debug.h"
-#include "gnutls_compress.h"
-#include "gnutls_cipher.h"
-#include "gnutls_buffers.h"
-#include "gnutls_mbuffers.h"
-#include "gnutls_handshake.h"
-#include "gnutls_hash_int.h"
-#include "gnutls_cipher_int.h"
+#include "compress.h"
+#include "cipher.h"
+#include "buffers.h"
+#include "mbuffers.h"
+#include "handshake.h"
+#include "hash_int.h"
+#include "cipher_int.h"
 #include "algorithms.h"
-#include "gnutls_db.h"
-#include "gnutls_auth.h"
-#include "gnutls_num.h"
-#include "gnutls_record.h"
-#include "gnutls_datum.h"
-#include "gnutls_constate.h"
+#include "db.h"
+#include "auth.h"
+#include "num.h"
+#include "record.h"
+#include "datum.h"
+#include "constate.h"
 #include "ext/max_record.h"
 #include <ext/heartbeat.h>
-#include <gnutls_state.h>
-#include <gnutls_dtls.h>
-#include <gnutls_dh.h>
+#include <state.h>
+#include <dtls.h>
+#include <dh.h>
 #include <random.h>
 
 struct tls_record_st {

diff --git a/lib/gnutls_record.h b/lib/record.h
similarity index 98%
rename from lib/gnutls_record.h
rename to lib/record.h
index cb0320c7a7a93f4f668f309a3073543fcbf9986e..7da8d3086f611130e1503fdc09191af4048453e6 100644 (file)
--- a/lib/gnutls_record.h
+++ b/lib/record.h
@@ -24,8 +24,8 @@
 #define GNUTLS_RECORD_H
 
 #include <gnutls/gnutls.h>
-#include <gnutls_buffers.h>
-#include <gnutls_constate.h>
+#include <buffers.h>
+#include <constate.h>
 
 ssize_t _gnutls_send_tlen_int(gnutls_session_t session,
                              content_type_t type,

diff --git a/lib/safe-memfuncs.c b/lib/safe-memfuncs.c
index 47d9ad12878adc0130fdf2d91c3c1fd181aab0cf..e5673e5737d3e2470b6ce902912994a4be24874d 100644 (file)
--- a/lib/safe-memfuncs.c
+++ b/lib/safe-memfuncs.c
@@ -21,7 +21,7 @@
 #ifdef TEST_SAFE_MEMSET
 # include <string.h>
 #else
-# include <gnutls_int.h>
+# include "gnutls_int.h"
 #endif
 
 /**

diff --git a/lib/gnutls_session.c b/lib/session.c
similarity index 98%
rename from lib/gnutls_session.c
rename to lib/session.c
index bd13d93030a0a9f973595f281b57585846f9e4fb..256e8d8f6803aaf6130aba347113aebb9fa66651 100644 (file)
--- a/lib/gnutls_session.c
+++ b/lib/session.c
@@ -20,10 +20,10 @@
  *
  */
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
+#include "errors.h"
 #include "debug.h"
-#include <gnutls_session_pack.h>
-#include <gnutls_datum.h>
+#include <session_pack.h>
+#include <datum.h>
 
 /**
  * gnutls_session_get_data:

diff --git a/lib/gnutls_session_pack.c b/lib/session_pack.c
similarity index 98%
rename from lib/gnutls_session_pack.c
rename to lib/session_pack.c
index c4ed67bae2e1d6a41c69ae702bb09bee2f6031c9..19229b70d92ece95ec1133add16c56ac11ff8e39 100644 (file)
--- a/lib/gnutls_session_pack.c
+++ b/lib/session_pack.c
@@ -24,25 +24,25 @@
  * before and after they are sent to the database backend.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #ifdef ENABLE_SRP
-#include <auth/srp.h>
+#include <auth/srp_kx.h>
 #endif
 #ifdef ENABLE_PSK
 #include <auth/psk.h>
 #endif
 #include <auth/anon.h>
 #include <auth/cert.h>
-#include <gnutls_errors.h>
-#include <gnutls_auth.h>
-#include <gnutls_session_pack.h>
-#include <gnutls_datum.h>
-#include <gnutls_num.h>
-#include <gnutls_extensions.h>
-#include <gnutls_constate.h>
+#include "errors.h"
+#include <auth.h>
+#include <session_pack.h>
+#include <datum.h>
+#include <num.h>
+#include <extensions.h>
+#include <constate.h>
 #include <algorithms.h>
-#include <gnutls_state.h>
-#include <gnutls_db.h>
+#include <state.h>
+#include <db.h>
 
 static int pack_certificate_auth_info(gnutls_session_t,
                                      gnutls_buffer_st * packed_session);

diff --git a/lib/gnutls_session_pack.h b/lib/session_pack.h
similarity index 100%
rename from lib/gnutls_session_pack.h
rename to lib/session_pack.h

diff --git a/lib/gnutls_srp.c b/lib/srp.c
similarity index 99%
rename from lib/gnutls_srp.c
rename to lib/srp.c
index b5d9170bf22b722c1f49020a6b484405993590ab..b993eae71ede7b66d875af7473acc4e6b2930337 100644 (file)
--- a/lib/gnutls_srp.c
+++ b/lib/srp.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <auth/srp.h>
-#include <gnutls_state.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <auth/srp_kx.h>
+#include <state.h>
 
 #ifdef ENABLE_SRP
 
-#include <gnutls_srp.h>
+#include "srp.h"
 #include <auth/srp_passwd.h>
-#include <gnutls_mpi.h>
-#include <gnutls_num.h>
-#include <gnutls_helper.h>
+#include <mpi.h>
+#include <num.h>
+#include <helper.h>
 #include <algorithms.h>
 #include <random.h>
 

diff --git a/lib/gnutls_srp.h b/lib/srp.h
similarity index 96%
rename from lib/gnutls_srp.h
rename to lib/srp.h
index b82cc577ef8a8545a26a98a1d55da59a92282162..3120f4b5b9a319aec930a50c0c470fcb185fa807 100644 (file)
--- a/lib/gnutls_srp.h
+++ b/lib/srp.h
@@ -20,6 +20,11 @@
  *
  */
 
+#ifndef _SRP_H
+# define _SRP_H
+
+#include <config.h>
+
 #ifdef ENABLE_SRP
 
 bigint_t _gnutls_calc_srp_B(bigint_t * ret_b, bigint_t g, bigint_t n,
@@ -38,3 +43,5 @@ int _gnutls_srp_gn(uint8_t ** ret_g, uint8_t ** ret_n, int bits);
 #define SRP_MAX_HASH_SIZE 24
 
 #endif
+
+#endif

diff --git a/lib/gnutls_v2_compat.c b/lib/sslv2_compat.c
similarity index 94%
rename from lib/gnutls_v2_compat.c
rename to lib/sslv2_compat.c
index 2d2b2d2a43625ccf27d2d3b056071437a1e796f2..8a717d38351c375c517e7801bf83c0e4d7eb6a09 100644 (file)
--- a/lib/gnutls_v2_compat.c
+++ b/lib/sslv2_compat.c
@@ -24,22 +24,22 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_dh.h"
+#include "errors.h"
+#include "dh.h"
 #include "debug.h"
 #include "algorithms.h"
-#include "gnutls_compress.h"
-#include "gnutls_cipher.h"
-#include "gnutls_buffers.h"
-#include "gnutls_kx.h"
-#include "gnutls_handshake.h"
-#include "gnutls_num.h"
-#include "gnutls_hash_int.h"
-#include "gnutls_db.h"
-#include "gnutls_extensions.h"
-#include "gnutls_auth.h"
-#include "gnutls_v2_compat.h"
-#include "gnutls_constate.h"
+#include "compress.h"
+#include "cipher.h"
+#include "buffers.h"
+#include "kx.h"
+#include "handshake.h"
+#include "num.h"
+#include "hash_int.h"
+#include "db.h"
+#include "extensions.h"
+#include "auth.h"
+#include "sslv2_compat.h"
+#include "constate.h"
 
 /* This selects the best supported ciphersuite from the ones provided */
 static int

diff --git a/lib/gnutls_v2_compat.h b/lib/sslv2_compat.h
similarity index 100%
rename from lib/gnutls_v2_compat.h
rename to lib/sslv2_compat.h

diff --git a/lib/gnutls_state.c b/lib/state.c
similarity index 98%
rename from lib/gnutls_state.c
rename to lib/state.c
index 940ea3f5ff9e9679bc5e68c3fbda978793b76109..738706a4d3ef938197bb4cc835611032bc20834b 100644 (file)
--- a/lib/gnutls_state.c
+++ b/lib/state.c
@@ -26,24 +26,24 @@
  * state has been renamed to session.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_auth.h>
-#include <gnutls_num.h>
-#include <gnutls_datum.h>
-#include <gnutls_db.h>
-#include <gnutls_record.h>
-#include <gnutls_handshake.h>
-#include <gnutls_dh.h>
-#include <gnutls_buffers.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_state.h>
-#include <gnutls_constate.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <auth.h>
+#include <num.h>
+#include <datum.h>
+#include <db.h>
+#include <record.h>
+#include <handshake.h>
+#include <dh.h>
+#include <buffers.h>
+#include <mbuffers.h>
+#include <state.h>
+#include <constate.h>
 #include <auth/cert.h>
 #include <auth/anon.h>
 #include <auth/psk.h>
 #include <algorithms.h>
-#include <gnutls_extensions.h>
+#include <extensions.h>
 #include <system.h>
 #include <random.h>
 #include <fips.h>

diff --git a/lib/gnutls_state.h b/lib/state.h
similarity index 98%
rename from lib/gnutls_state.h
rename to lib/state.h
index da419a2d99e6c33c123fc98e097270399a4e63e8..9e5fff848a37c16339cd88d634efdd0d47e7cfe5 100644 (file)
--- a/lib/gnutls_state.h
+++ b/lib/state.h
@@ -23,7 +23,7 @@
 #ifndef GNUTLS_STATE_H
 #define GNUTLS_STATE_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 void _gnutls_session_cert_type_set(gnutls_session_t session,
                                   gnutls_certificate_type_t);
@@ -50,7 +50,7 @@ _gnutls_hello_set_default_version(gnutls_session_t session,
                                   unsigned char major,
                                   unsigned char minor);
 
-#include <gnutls_auth.h>
+#include <auth.h>
 
 #define CHECK_AUTH(auth, ret) if (gnutls_auth_get_type(session) != auth) { \
        gnutls_assert(); \

diff --git a/lib/gnutls_str.c b/lib/str.c
similarity index 99%
rename from lib/gnutls_str.c
rename to lib/str.c
index 469b6680f69c1d36edff25af866b83751c74df2b..6b5f49ca8961bf629131054fa5a8d355085bee9b 100644 (file)
--- a/lib/gnutls_str.c
+++ b/lib/str.c
@@ -20,10 +20,10 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
+#include "str.h"
 #include <stdarg.h>
 #include <c-ctype.h>
 #include <intprops.h>

diff --git a/lib/gnutls_str.h b/lib/str.h
similarity index 98%
rename from lib/gnutls_str.h
rename to lib/str.h
index 016a538e32f3b466f677e171500482261bbf76e1..c723e1457a753305c57cb933b924eac2f6fff11d 100644 (file)
--- a/lib/gnutls_str.h
+++ b/lib/str.h
@@ -24,8 +24,8 @@
 #define GNUTLS_STR_H
 
 #include <config.h>
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
+#include "gnutls_int.h"
+#include <datum.h>
 
 #ifdef HAVE_DCGETTEXT
 # include "gettext.h"
@@ -67,7 +67,7 @@ int _gnutls_buffer_append_str(gnutls_buffer_st *, const char *str);
 
 #define _gnutls_buffer_append_data gnutls_buffer_append_data
 
-#include <gnutls_num.h>
+#include <num.h>
 
 void _gnutls_buffer_replace_data(gnutls_buffer_st * buf,
                                 gnutls_datum_t * data);

diff --git a/lib/gnutls_str_array.h b/lib/str_array.h
similarity index 98%
rename from lib/gnutls_str_array.h
rename to lib/str_array.h
index 57aa828ac61d096b11ddbc0ffece7bd3b3384932..ef68783905345e5144af84faa3ecd052ef89a16e 100644 (file)
--- a/lib/gnutls_str_array.h
+++ b/lib/str_array.h
@@ -23,8 +23,8 @@
 #ifndef GNUTLS_STR_ARRAY_H
 #define GNUTLS_STR_ARRAY_H
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 
 /* Functionality to allow an array of strings. Strings
  * are allowed to be added to the list and matched against it.

diff --git a/lib/gnutls_supplemental.c b/lib/supplemental.c
similarity index 99%
rename from lib/gnutls_supplemental.c
rename to lib/supplemental.c
index 91dfeb132195b36159a7e49a2897c40f47be30f7..4e2df85abdf771c2291a5e6faf82e538f71a3a76 100644 (file)
--- a/lib/gnutls_supplemental.c
+++ b/lib/supplemental.c
@@ -45,9 +45,9 @@
 
 #include "gnutls_int.h"
 #include <gnutls/gnutls.h>
-#include "gnutls_supplemental.h"
-#include "gnutls_errors.h"
-#include "gnutls_num.h"
+#include "supplemental.h"
+#include "errors.h"
+#include "num.h"
 
 typedef struct {
        char *name;

diff --git a/lib/gnutls_supplemental.h b/lib/supplemental.h
similarity index 97%
rename from lib/gnutls_supplemental.h
rename to lib/supplemental.h
index 63004f57adf8d49b3abd907205ac6617536c6cc9..e9ffd55c2668c5bc33f34eeeff0ebb3a6df7f702 100644 (file)
--- a/lib/gnutls_supplemental.h
+++ b/lib/supplemental.h
@@ -20,7 +20,7 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 int _gnutls_parse_supplemental(gnutls_session_t session,
                               const uint8_t * data, int data_size);

diff --git a/lib/system-keys-dummy.c b/lib/system-keys-dummy.c
index 369542f5ecd2fe91ff4e5aeff2f6c48fa32308c3..269af8038c603af72b87b171b9f3ea085a0bdc86 100644 (file)
--- a/lib/system-keys-dummy.c
+++ b/lib/system-keys-dummy.c
@@ -18,15 +18,15 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/abstract.h>
 #include <gnutls/pkcs12.h>
 #include <gnutls/system-keys.h>
 #include "system-keys.h"
-#include <gnutls_sig.h>
-#include <gnutls_pk.h>
+#include <tls-sig.h>
+#include <pk.h>
 
 void gnutls_system_key_iter_deinit(gnutls_system_key_iter_t iter)
 {

diff --git a/lib/system-keys-win.c b/lib/system-keys-win.c
index 170d13cd8a452f431fde1ed3947db5a085e81f2e..e3f6b57c58f0cb461396e360c8abd7d3fc242550 100644 (file)
--- a/lib/system-keys-win.c
+++ b/lib/system-keys-win.c
@@ -26,15 +26,15 @@
 #endif
 
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <gnutls/gnutls.h>
 #include <gnutls/abstract.h>
 #include <gnutls/pkcs12.h>
 #include <gnutls/system-keys.h>
 #include "system-keys.h"
-#include <gnutls_sig.h>
-#include <gnutls_pk.h>
+#include <tls-sig.h>
+#include <pk.h>
 #include <urls.h>
 
 #if !defined(_WIN32)

diff --git a/lib/system.c b/lib/system.c
index f12dbfc2f3ec02662442ed43e2d4c331956771ca..d5ad679c73dd702d7f01a247f10f1de7b6eb687c 100644 (file)
--- a/lib/system.c
+++ b/lib/system.c
@@ -22,8 +22,8 @@
 
 #include <config.h>
 #include <system.h>
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 
 #include <sys/socket.h>
 #include <errno.h>

diff --git a/lib/system.h b/lib/system.h
index 23d291d41d1f033cf56dce4409d68d02924792af..dd77365a1cd23664e427aa271abdfe2c04ef7174 100644 (file)
--- a/lib/system.h
+++ b/lib/system.h
@@ -23,7 +23,7 @@
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <time.h>
 #include <sys/time.h>
 

diff --git a/lib/system_override.c b/lib/system_override.c
index ec6747bfb25f6a461d5fcf91de89950be3fa5111..79a4db0de46973cc221d15050c0b8f07348d7351 100644 (file)
--- a/lib/system_override.c
+++ b/lib/system_override.c
@@ -24,14 +24,14 @@
  * default berkeley sockets API per session.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
-#include <gnutls_record.h>
-#include <gnutls_buffers.h>
-#include <gnutls_mbuffers.h>
-#include <gnutls_state.h>
-#include <gnutls_dtls.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <num.h>
+#include <record.h>
+#include <buffers.h>
+#include <mbuffers.h>
+#include <state.h>
+#include <dtls.h>
 #include <system.h>
 
 #include <errno.h>

diff --git a/lib/gnutls_sig.c b/lib/tls-sig.c
similarity index 98%
rename from lib/gnutls_sig.c
rename to lib/tls-sig.c
index 215404b1701c70c0804b9ccb8bbb7de061742148..8706ac598bc805843b099580e7d16b8e39a589bf 100644 (file)
--- a/lib/gnutls_sig.c
+++ b/lib/tls-sig.c
@@ -20,22 +20,22 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <x509_b64.h>
 #include <auth/cert.h>
 #include <algorithms.h>
-#include <gnutls_datum.h>
-#include <gnutls_mpi.h>
-#include <gnutls_global.h>
-#include <gnutls_pk.h>
+#include <datum.h>
+#include <mpi.h>
+#include <global.h>
+#include <pk.h>
 #include <debug.h>
-#include <gnutls_buffers.h>
-#include <gnutls_sig.h>
-#include <gnutls_kx.h>
+#include <buffers.h>
+#include <tls-sig.h>
+#include <kx.h>
 #include <libtasn1.h>
 #include <ext/signature.h>
-#include <gnutls_state.h>
+#include <state.h>
 #include <x509/common.h>
 #include <abstract_int.h>
 

diff --git a/lib/gnutls_sig.h b/lib/tls-sig.h
similarity index 100%
rename from lib/gnutls_sig.h
rename to lib/tls-sig.h

diff --git a/lib/tpm.c b/lib/tpm.c
index 272f96aa87168087c90d2519afceff5951cb3f68..4ec9a9592790f993db20ad427bf01b38152074e5 100644 (file)
--- a/lib/tpm.c
+++ b/lib/tpm.c
@@ -32,11 +32,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/abstract.h>
 #include <gnutls/tpm.h>
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
 #ifdef HAVE_TROUSERS
 
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <pkcs11_int.h>
 #include <x509/common.h>
 #include <x509_b64.h>

diff --git a/lib/gnutls_ui.c b/lib/ui.c
similarity index 99%
rename from lib/gnutls_ui.c
rename to lib/ui.c
index f5e853032761ebac4cf2c5b9e14adc84b1c5f766..7aa9f06af7f1c64146d1a3ab87b37ffae8cd4d9c 100644 (file)
--- a/lib/gnutls_ui.c
+++ b/lib/ui.c
@@ -24,15 +24,15 @@
  * API which did not fit elsewhere.
  */
 
-#include <gnutls_int.h>
-#include <auth/srp.h>
+#include "gnutls_int.h"
+#include <auth/srp_kx.h>
 #include <auth/anon.h>
 #include <auth/cert.h>
 #include <auth/psk.h>
-#include <gnutls_errors.h>
-#include <gnutls_auth.h>
-#include <gnutls_state.h>
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <auth.h>
+#include <state.h>
+#include <datum.h>
 #include <extras/randomart.h>
 #include <read-file.h>
 #include <algorithms.h>

diff --git a/lib/urls.c b/lib/urls.c
index 1092cb4c7f5af31fdc5f71cb12b2ac092947ad37..77aac9a3052ba20dbb01dc76d995012dfd038c6e 100644 (file)
--- a/lib/urls.c
+++ b/lib/urls.c
@@ -18,9 +18,9 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include "str.h"
 #include "urls.h"
 #include "system-keys.h"
 

diff --git a/lib/verify-tofu.c b/lib/verify-tofu.c
index fd775ed0c4fabb63d8c144763a8c0cbb090be6dd..b81d25518380283563b1fb4a327bc5e8dec0ac8c 100644 (file)
--- a/lib/verify-tofu.c
+++ b/lib/verify-tofu.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>                /* MAX */
-#include <gnutls_sig.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <global.h>
+#include <num.h>               /* MAX */
+#include <tls-sig.h>
+#include "str.h"
+#include <datum.h>
 #include "x509_int.h"
 #include <nettle/base64.h>
 #include <common.h>

diff --git a/lib/gnutls_x509.c b/lib/x509.c
similarity index 99%
rename from lib/gnutls_x509.c
rename to lib/x509.c
index ae41d7119bb908ff338c769802fd83229d9e0a3e..59a856bba6db370a6974b40bce6c0eb043d3dbfb 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/x509.c
@@ -20,28 +20,28 @@
  *
  */
 
-#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 "gnutls_datum.h"
-#include <gnutls_pk.h>
+#include "dh.h"
+#include "num.h"
+#include "datum.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_str.h>
+#include <global.h>
+#include <record.h>
+#include <tls-sig.h>
+#include <state.h>
+#include <pk.h>
+#include "str.h"
 #include <debug.h>
 #include <x509_b64.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <gnutls/ocsp.h>
 #include "x509/common.h"
 #include "x509/x509_int.h"
-#include <gnutls_str_array.h>
+#include <str_array.h>
 #include <gnutls/x509.h>
 #include "read-file.h"
 #include "system-keys.h"

diff --git a/lib/gnutls_x509.h b/lib/x509.h
similarity index 100%
rename from lib/gnutls_x509.h
rename to lib/x509.h

diff --git a/lib/x509/common.c b/lib/x509/common.c
index 8e8ee68fb571c194580d2f00117cae35cdd9a58a..eb0c411e5427d0a556fbbb838c308ec53ea0d0b4 100644 (file)
--- a/lib/x509/common.c
+++ b/lib/x509/common.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
-#include <gnutls_str.h>
-#include <gnutls_x509.h>
-#include <gnutls_num.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
+#include <str.h>
+#include <x509.h>
+#include <num.h>
 #include <x509_b64.h>
 #include "x509_int.h"
 #include "extras/hex.h"

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index ea9175e0feeda19fcc46506d9c8a01606e3f7f10..3b7ab83dcd067c9d5d97c99a4fcf2700552db554 100644 (file)
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -20,16 +20,16 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 
 static int crl_reinit(gnutls_x509_crl_t crl)
 {

diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 7716ce3e4ed824b64fcecf2498eeddf0fa461d13..ce0beb5dbcca716c099a95646260ae31b6de458c 100644 (file)
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -23,13 +23,13 @@
 /* This file contains functions to handle CRL generation.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
 #include <libtasn1.h>

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 81daee88fce9579fd9e6ab56334ce4e4ceb56e20..77eff5b848fb99140c6d9c3133c42421ff643c38 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -25,13 +25,13 @@
    requests, see RFC 2986.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <gnutls/x509-ext.h>
 #include "x509_int.h"

diff --git a/lib/x509/dn.c b/lib/x509/dn.c
index a3522e6a30345e66ab84c150bced4ce69c9fc200..5e6242698c3446e39db6872ff2c48342eaf81e61 100644 (file)
--- a/lib/x509/dn.c
+++ b/lib/x509/dn.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
-#include <gnutls_str.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
+#include <str.h>
 #include <common.h>
-#include <gnutls_num.h>
+#include <num.h>
 
 /* This file includes all the required to parse an X.509 Distriguished
  * Name (you need a parser just to read a name in the X.509 protocols!!!)

diff --git a/lib/x509/email-verify.c b/lib/x509/email-verify.c
index 4e9b0a16724429f37dd7d9daa74cceb6315cfafb..1b0da2e3dfd041cdcca83a20e6993b5dbb33c551 100644 (file)
--- a/lib/x509/email-verify.c
+++ b/lib/x509/email-verify.c
@@ -19,11 +19,11 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include <str.h>
 #include <x509_int.h>
 #include <common.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <system.h>
 #include <gnutls-idna.h>
 

diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index af90dec6c283daf48f557342c541734a3d52de23..148766dc68dbb4d4165d8fc947fcf31323e492da 100644 (file)
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -23,15 +23,15 @@
 /* Functions that relate to the X.509 extension parsing.
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_global.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <global.h>
 #include <libtasn1.h>
 #include <common.h>
 #include <gnutls/x509-ext.h>
 #include <gnutls/x509.h>
 #include <x509_int.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 
 int
 _gnutls_get_extension(ASN1_TYPE asn, const char *root,

diff --git a/lib/x509/hostname-verify.c b/lib/x509/hostname-verify.c
index 62ad4fafa9f6fb234f4925bd6a21f04ae089b5d0..a086240e58add2f89db9d73f26bc0536454b6111 100644 (file)
--- a/lib/x509/hostname-verify.c
+++ b/lib/x509/hostname-verify.c
@@ -19,11 +19,11 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_str.h>
+#include "gnutls_int.h"
+#include <str.h>
 #include <x509_int.h>
 #include <common.h>
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <system.h>
 #include <gnutls-idna.h>
 

diff --git a/lib/x509/key_decode.c b/lib/x509/key_decode.c
index a312910415fb8acf95c09b70bc50c6911533d47c..049e93a951917b2e3b354e8c28f1d538b2a0fe91 100644 (file)
--- a/lib/x509/key_decode.c
+++ b/lib/x509/key_decode.c
@@ -21,15 +21,15 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_global.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <global.h>
 #include <libtasn1.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 #include "common.h"
 #include "x509_int.h"
-#include <gnutls_num.h>
-#include <gnutls_ecc.h>
+#include <num.h>
+#include <ecc.h>
 
 static int _gnutls_x509_read_rsa_pubkey(uint8_t * der, int dersize,
                                        gnutls_pk_params_st * params);

diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c
index cbad9c4621f6e9599ae52641a422a46e61b4bde4..7da4cbef2d92a6efe2302caec1fb8a5ef896a394 100644 (file)
--- a/lib/x509/key_encode.c
+++ b/lib/x509/key_encode.c
@@ -21,17 +21,17 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_global.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <global.h>
 #include <libtasn1.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 #include "common.h"
 #include "x509_int.h"
-#include <gnutls_num.h>
-#include <gnutls_pk.h>
-#include <gnutls_mpi.h>
-#include <gnutls_ecc.h>
+#include <num.h>
+#include <pk.h>
+#include <mpi.h>
+#include <ecc.h>
 
 static int _gnutls_x509_write_rsa_pubkey(gnutls_pk_params_st * params,
                                         gnutls_datum_t * der);

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 536e599e8f36f862d1bea770a8a4b8e551abc48a..49059d286701cadcb6c9d9435213ee567bff9ff4 100644 (file)
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -20,14 +20,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
-#include <gnutls_global.h>
+#include "gnutls_int.h"
+#include "errors.h"
+#include <global.h>
 #include <libtasn1.h>
-#include <gnutls_datum.h>
+#include <datum.h>
 #include "common.h"
 #include "x509_int.h"
-#include <gnutls_num.h>
+#include <num.h>
 
 /* Reads an Integer from the DER encoded data
  */

diff --git a/lib/x509/name_constraints.c b/lib/x509/name_constraints.c
index 26b3fcf25a29f2f28e0d73ec4862a8ab95b91c66..ca575613479c0a5a016287636ac3126db19d339e 100644 (file)
--- a/lib/x509/name_constraints.c
+++ b/lib/x509/name_constraints.c
@@ -21,12 +21,12 @@
 /* Functions on X.509 Certificate parsing
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <gnutls/x509-ext.h>
 #include <x509_b64.h>
 #include <x509_int.h>

diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index 7686a4e8f3ab19dee624e962ac99f5d60cd4dbc6..8049e24e913612418c163a3c888fd4f6adf136ca 100644 (file)
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -22,11 +22,11 @@
 /* Online Certificate Status Protocol - RFC 2560
  */
 
-#include <gnutls_int.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <global.h>
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include "common.h"
 #include "verify-high.h"
 

diff --git a/lib/x509/ocsp_output.c b/lib/x509/ocsp_output.c
index 311c5aaf91c468a94de7667de48451c19a0dc1ff..a4e7497744179d4a5944e14314d593b571ef80f9 100644 (file)
--- a/lib/x509/ocsp_output.c
+++ b/lib/x509/ocsp_output.c
@@ -22,12 +22,12 @@
 /* Online Certificate Status Protocol - RFC 2560
  */
 
-#include <gnutls_int.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <global.h>
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_pk.h>
-#include <gnutls_str.h>
+#include <pk.h>
+#include <str.h>
 #include "algorithms.h"
 
 #include <gnutls/ocsp.h>

diff --git a/lib/x509/output.c b/lib/x509/output.c
index 5cef68c77b8ec405e232e6dcbdaaa3a05c3cddf2..b4d6777c27007720a08d210ace2bd0dc5f488c1c 100644 (file)
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -23,12 +23,12 @@
 /* Functions for printing X.509 Certificate structures
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_int.h>
-#include <gnutls_num.h>
-#include <gnutls_errors.h>
+#include <num.h>
+#include "errors.h"
 #include <extras/randomart.h>
 #include <c-ctype.h>
 #include <gnutls-idna.h>

diff --git a/lib/x509/pkcs12.c b/lib/x509/pkcs12.c
index 5e4fe115284b3c891c71afceb9bc9d767a890234..007823f9c515025c656c9be859a708c2c0c32ec2 100644 (file)
--- a/lib/x509/pkcs12.c
+++ b/lib/x509/pkcs12.c
@@ -24,13 +24,13 @@
 /* Functions that relate on PKCS12 packet parsing.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
-#include <gnutls_num.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
+#include <num.h>
 #include <common.h>
 #include <x509_b64.h>
 #include "x509_int.h"

diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 2807b5dd9abbd748fb7b5c8ec1f2f6cac2840263..480e13b6d6a8eda992ba9ab47acb2e7448cabb3a 100644 (file)
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -24,11 +24,11 @@
 /* Functions that relate on PKCS12 Bag packet parsing.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
 #include "x509_int.h"
 

diff --git a/lib/x509/pkcs12_encr.c b/lib/x509/pkcs12_encr.c
index adb84ba6a1ef51ec5e3be30ab8fe3641b1133650..5c6de640dbc92f35920a6537617003fd21751020 100644 (file)
--- a/lib/x509/pkcs12_encr.c
+++ b/lib/x509/pkcs12_encr.c
@@ -19,10 +19,10 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_mpi.h>
-#include <gnutls_errors.h>
+#include <mpi.h>
+#include "errors.h"
 #include <x509_int.h>
 #include <c-ctype.h>
 #include <algorithms.h>

diff --git a/lib/x509/pkcs7-attrs.c b/lib/x509/pkcs7-attrs.c
index 73593f683f849b9f5416f6d0e5d65681592d1e17..9bfbe2f329baa24ead5cd2860950c08f3474dd89 100644 (file)
--- a/lib/x509/pkcs7-attrs.c
+++ b/lib/x509/pkcs7-attrs.c
@@ -23,11 +23,11 @@
 /* Functions that relate on PKCS7 attribute setting.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
 #include <x509_b64.h>
 #include <gnutls/abstract.h>

diff --git a/lib/x509/pkcs7-output.c b/lib/x509/pkcs7-output.c
index 54427b300959a97d32c27e251a4bf2b57f80dc21..84986800d550087846338ec49f33b494d0aed90e 100644 (file)
--- a/lib/x509/pkcs7-output.c
+++ b/lib/x509/pkcs7-output.c
@@ -20,12 +20,12 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_int.h>
-#include <gnutls_num.h>
-#include <gnutls_errors.h>
+#include <num.h>
+#include "errors.h"
 #include <extras/randomart.h>
 #include <c-ctype.h>
 #include <gnutls-idna.h>

diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c
index 1367b2507b834ef3a33abfec9ba7284cd095a196..5d3910f98caab4f0b930964c8a82301b351919e2 100644 (file)
--- a/lib/x509/pkcs7.c
+++ b/lib/x509/pkcs7.c
@@ -24,12 +24,12 @@
 /* Functions that relate on PKCS7 certificate lists parsing.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 #include <libtasn1.h>
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
 #include <x509_b64.h>
 #include <gnutls/abstract.h>

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 2676bd8811d000e1187d5b84857ce245441e6e39..f97477cf9cdceb65f629a1e4c69b06f2429bea9e 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -20,18 +20,18 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
-#include <gnutls_sig.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
+#include <tls-sig.h>
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
-#include <gnutls_pk.h>
-#include <gnutls_mpi.h>
-#include <gnutls_ecc.h>
+#include <pk.h>
+#include <mpi.h>
+#include <ecc.h>
 #include <pin.h>
 
 /**

diff --git a/lib/x509/privkey_openssl.c b/lib/x509/privkey_openssl.c
index c6feb00630646c4ac3fbefb89cd5f3c0a2309f42..3b143f8457f2ce8237d4f5f557cb6bbef4629f57 100644 (file)
--- a/lib/x509/privkey_openssl.c
+++ b/lib/x509/privkey_openssl.c
@@ -20,17 +20,17 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include "x509_int.h"
 #include <algorithms.h>
-#include <gnutls_num.h>
+#include <num.h>
 #include <random.h>
 
 static int

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index ff8d598457096f045b18c9a2e1dee565bf5ced50..771043a40e69ac3472018392b1f0fd2655e65a42 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -22,17 +22,17 @@
  *
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include "x509_int.h"
 #include <algorithms.h>
-#include <gnutls_num.h>
+#include <num.h>
 #include <random.h>
 #include <nettle/pbkdf2.h>
 

diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 3b9ceb6c1936e117718bac79efe59898ed4fe419..9ed7fd94a97576d8622f656c940ee891b44ff722 100644 (file)
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -24,15 +24,15 @@
  * included here
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_errors.h>
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>                /* MAX */
-#include <gnutls_sig.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <global.h>
+#include <num.h>               /* MAX */
+#include <tls-sig.h>
+#include <str.h>
+#include <datum.h>
 #include <x509_int.h>
 #include <common.h>
 #include <gnutls/abstract.h>

diff --git a/lib/x509/verify-high.c b/lib/x509/verify-high.c
index ff5524e4e08eeac5671634715a6403941575b753..895f9b885860a1a11bfd7ad86da96220aed3af75 100644 (file)
--- a/lib/x509/verify-high.c
+++ b/lib/x509/verify-high.c
@@ -21,14 +21,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>                /* MAX */
-#include <gnutls_sig.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <global.h>
+#include <num.h>               /* MAX */
+#include <tls-sig.h>
+#include <str.h>
+#include <datum.h>
 #include <hash-pjw-bare.h>
 #include "x509_int.h"
 #include <common.h>

diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
index 558fa89e43720e9e8f5e9922a5532ad5c7d99e86..46a0db9f68ea81100dc6c57e54e11e3ac50d1384 100644 (file)
--- a/lib/x509/verify-high2.c
+++ b/lib/x509/verify-high2.c
@@ -21,14 +21,14 @@
  *
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>
-#include <gnutls_sig.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <global.h>
+#include <num.h>
+#include <tls-sig.h>
+#include <str.h>
+#include <datum.h>
 #include "x509_int.h"
 #include <common.h>
 #include "verify-high.h"

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 0d83a78d0be0e5ab5832224e776b5ee61d93b8f8..27eba6ed468bed94f1b17932751da1225e6a6c10 100644 (file)
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -26,17 +26,17 @@
  * included here
  */
 
-#include <gnutls_int.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include "errors.h"
 #include <libtasn1.h>
-#include <gnutls_global.h>
-#include <gnutls_num.h>                /* MAX */
-#include <gnutls_sig.h>
-#include <gnutls_str.h>
-#include <gnutls_datum.h>
+#include <global.h>
+#include <num.h>               /* MAX */
+#include <tls-sig.h>
+#include <str.h>
+#include <datum.h>
 #include <x509_int.h>
 #include <common.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <stdbool.h>
 
 /* Checks if two certs have the same name and the same key.  Return 1 on match. 

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index aac2b2630cbf36625fd933a5317dcec05e16f943..cfc8ee1649fb9be9d175f131912661391c093ce5 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -22,17 +22,17 @@
 /* Functions on X.509 Certificate parsing
  */
 
-#include <gnutls_int.h>
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include "gnutls_int.h"
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
 #include <gnutls/x509-ext.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <x509_int.h>
 #include <libtasn1.h>
-#include <gnutls_pk.h>
+#include <pk.h>
 #include <pkcs11_int.h>
 #include "urls.h"
 #include "system-keys.h"

diff --git a/lib/x509/x509_dn.c b/lib/x509/x509_dn.c
index b6fe3f61fef7b8e1973e91d10cef6586b50a4ebc..371fbd0c90d0e8f9ac7d5c1165a2b988f1da6e19 100644 (file)
--- a/lib/x509/x509_dn.c
+++ b/lib/x509/x509_dn.c
@@ -21,13 +21,13 @@
 /* This file contains functions to handle X.509 certificate generation.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <c-ctype.h>
 

diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index b4230b21a2bb3dfcb80960f295f96f5b8d081ba4..9a0052733eb39b5e1104122fd7db703487693fd1 100644 (file)
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -21,12 +21,12 @@
 /* This file contains functions to handle X.509 certificate extensions (the x509-ext API)
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <x509_b64.h>
 #include <c-ctype.h>
 #include <gnutls/x509-ext.h>

diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 5ddbc0869d69fdb3dc2b5b87f7d7cc459d9d9142..9ef092a35eb4f02946bdb62f5db4ecb110e9c482 100644 (file)
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -23,13 +23,13 @@
 /* This file contains functions to handle X.509 certificate generation.
  */
 
-#include <gnutls_int.h>
+#include "gnutls_int.h"
 
-#include <gnutls_datum.h>
-#include <gnutls_global.h>
-#include <gnutls_errors.h>
+#include <datum.h>
+#include <global.h>
+#include "errors.h"
 #include <common.h>
-#include <gnutls_x509.h>
+#include <x509.h>
 #include <gnutls/x509-ext.h>
 #include <x509_b64.h>
 #include "x509_int.h"

diff --git a/lib/x509_b64.c b/lib/x509_b64.c
index 09e860c2081dfbfb4d0586d81c90e97f1d0215dc..d9527b2bd9a38d28f0edc6ac12e9ce4440787bb4 100644 (file)
--- a/lib/x509_b64.c
+++ b/lib/x509_b64.c
@@ -24,8 +24,8 @@
  */
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include <gnutls_datum.h>
+#include "errors.h"
+#include <datum.h>
 #include <x509_b64.h>
 #include <nettle/base64.h>
 

diff --git a/tests/gc.c b/tests/gc.c
index 106fb4222c70cf3637163f8994d3d7785d67e193..e58bd17a1ea1960b9ea555d951e584a4ee1e1c22 100644 (file)
--- a/tests/gc.c
+++ b/tests/gc.c
@@ -29,7 +29,7 @@
 #include "utils.h"
 
 #include "../lib/gnutls_int.h"
-#include "../lib/gnutls_hash_int.h"
+#include "../lib/hash_int.h"
 #include "../lib/debug.h"
 
 static void tls_log_func(int level, const char *str)

diff --git a/tests/mpi.c b/tests/mpi.c
index f0cf9aba8ae20b28fd608db14c3f1c2f4500a1af..604024622d71d49d64b1c66333db1125253056ab 100644 (file)
--- a/tests/mpi.c
+++ b/tests/mpi.c
@@ -28,8 +28,8 @@
 
 #include "utils.h"
 #include "../lib/gnutls_int.h"
-#include "../lib/gnutls_mpi.h"
-#include "../lib/gnutls_errors.h"
+#include "../lib/mpi.h"
+#include "../lib/errors.h"
 #include "../lib/debug.h"
 
 static void tls_log_func(int level, const char *str)

diff --git a/tests/openpgp_test.c b/tests/openpgp_test.c
index 861efaa610cfb70308facc4d23586a04559a5c6c..ee9522f2e9ba0d2471a4dbea2a3ff83ebe65d091 100644 (file)
--- a/tests/openpgp_test.c
+++ b/tests/openpgp_test.c
@@ -1,15 +1,15 @@
 /** t-openpgp.c -- OpenPGP regression test **/
 
 #include "gnutls_int.h"
-#include "gnutls_errors.h"
-#include "gnutls_mpi.h"
-#include "gnutls_cert.h"
-#include "gnutls_datum.h"
-#include "gnutls_global.h"
-#include "auth_cert.h"
-#include "gnutls_openpgp.h"
-
-#include <gnutls_str.h>
+#include "errors.h"
+#include "mpi.h"
+#include "cert.h"
+#include "datum.h"
+#include "global.h"
+#include "auth/cert.h"
+#include "openpgp.h"
+
+#include <str.h>
 #include <stdio.h>
 #include <gcrypt.h>
 #include <time.h>