Rename lib/x509/x509.h to x509_int.h.

Fixes name-space collision that confuses GTK-DOC with includes/gnutls/x509.h.

diff --git a/lib/auth_cert.h b/lib/auth_cert.h
index 27f67c985c48b236e8b232ff92fd94832b930a1a..5258e2be76afe0708b80127ae4485772211f4785 100644 (file)
--- a/lib/auth_cert.h
+++ b/lib/auth_cert.h
@@ -27,7 +27,7 @@
 # include "gnutls_cert.h"
 # include "gnutls_auth.h"
 # include "auth_dh_common.h"
-# include "x509/x509.h"
+# include "x509/x509_int.h"
 # include "openpgp/openpgp_int.h"
 
 /* This structure may be complex, but it's the only way to

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 17c47840a589a66e8f97c105e47c6474a017bbcc..1f24ae100e7d307c13c1082401fbce87530ea9da 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -40,7 +40,7 @@
 #include <gnutls_state.h>
 #include <gnutls_auth_int.h>
 #include <gnutls_x509.h>
-#include "x509/x509.h"
+#include "x509/x509_int.h"
 #include "x509/mpi.h"
 #ifdef ENABLE_OPENPGP
 # include "openpgp/gnutls_openpgp.h"

diff --git a/lib/gnutls_cert.h b/lib/gnutls_cert.h
index 75f7e21f600fa4a2b977385e0500aef30436f2e3..426554cc898a109677ffe6248fcf7f4bd6cea534 100644 (file)
--- a/lib/gnutls_cert.h
+++ b/lib/gnutls_cert.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -27,7 +27,7 @@
 
 #include <gnutls_pk.h>
 #include <libtasn1.h>
-#include "x509/x509.h"
+#include "x509/x509_int.h"
 #include <gnutls/openpgp.h>
 
 #define MAX_PUBLIC_PARAMS_SIZE 4       /* ok for RSA and DSA */

diff --git a/lib/gnutls_rsa_export.c b/lib/gnutls_rsa_export.c
index 46e4ad75cefab7d50cb3519f4535269d3bfa791e..f15c36982cbe8886c16c8b6e109d0afb3fea88e9 100644 (file)
--- a/lib/gnutls_rsa_export.c
+++ b/lib/gnutls_rsa_export.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -30,7 +30,7 @@
 #include <gnutls_errors.h>
 #include <gnutls_datum.h>
 #include <gnutls_rsa_export.h>
-#include "x509/x509.h"
+#include "x509/x509_int.h"
 #include "x509/privkey.h"
 #include "debug.h"
 

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 39c47536c299b76faf2e0e115efeb64a651a205f..f78b5c6277c66d9509065c99b91486edf28a1cc1 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -43,7 +43,7 @@
 #include <x509_b64.h>
 #include <gnutls_x509.h>
 #include "x509/common.h"
-#include "x509/x509.h"
+#include "x509/x509_int.h"
 #include "x509/verify.h"
 #include "x509/mpi.h"
 #include "x509/pkcs7.h"

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index e5f246093ad6b54da810837bdef09e3ffa81716e..6e7536d65131ac15fa7b67dd0d7e8dd34e371b8c 100644 (file)
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -32,7 +32,7 @@
 #include <gnutls_errors.h>
 #include <common.h>
 #include <x509_b64.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <dn.h>
 
 /**

diff --git a/lib/x509/extensions.c b/lib/x509/extensions.c
index ecffca321142033856d39af90cb231a8911ce560..cb3f13f236e50bce13d3276f940ba4416b49a9ce 100644 (file)
--- a/lib/x509/extensions.c
+++ b/lib/x509/extensions.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -31,7 +31,7 @@
 #include <mpi.h>
 #include <libtasn1.h>
 #include <common.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <extensions.h>
 #include <gnutls_datum.h>
 

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 190615e10928c85e0b3769c418a528e41b9d9d11..d0fc52e32dfe8f5492acdffebaac012820b48562 100644 (file)
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -28,7 +28,7 @@
 #include <libtasn1.h>
 #include <gnutls_datum.h>
 #include "common.h"
-#include "x509.h"
+#include "x509_int.h"
 #include <gnutls_num.h>
 #include "mpi.h"
 

diff --git a/lib/x509/mpi.h b/lib/x509/mpi.h
index 785d7e022c91e64e15b764536138445c0f339de8..c8bd72a64355e23b451969255795e96ed7262094 100644 (file)
--- a/lib/x509/mpi.h
+++ b/lib/x509/mpi.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -23,7 +23,7 @@
  */
 
 #include <gnutls_int.h>
-#include "x509.h"
+#include "x509_int.h"
 
 int _gnutls_x509_crt_get_mpis (gnutls_x509_crt_t cert,
                               mpi_t * params, int *params_size);

diff --git a/lib/x509/output.c b/lib/x509/output.c
index 75a1110aaf3e34cbcb69820c2a5812239bebccd1..42e709f94755726b4f3fc48b00cf8e2e504a47f1 100644 (file)
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -28,7 +28,7 @@
 #include <gnutls_int.h>
 #include <common.h>
 #include <gnutls_x509.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <gnutls_errors.h>
 
 /* I18n of error codes. */

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index a9e9d130693b7b454648d4d660d5afb9aa5ba9ac..e6c76b61ad7c2ee1cb2b01dcc9d68260404555ee 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
 #include <extensions.h>

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 349d4cea202622e6eebee89b721da39131fbbf72..350fb5e272bdf8a4408edba6dbf91eee17203329 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -33,7 +33,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <pkcs12.h>
 #include <privkey.h>

diff --git a/lib/x509/rfc2818_hostname.c b/lib/x509/rfc2818_hostname.c
index a3ddde184cf766f24ef0aee0d621a76711997cc1..f2fd3acad8a7c1dc450c9b40c9af494515ffb5a3 100644 (file)
--- a/lib/x509/rfc2818_hostname.c
+++ b/lib/x509/rfc2818_hostname.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2007, 2008 Free Software Foundation
  * Copyright (C) 2002 Andrew McDonald
  *
  * This file is part of GNUTLS.
@@ -22,7 +22,7 @@
  */
 
 #include <gnutls_int.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <common.h>
 #include <rfc2818.h>

diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 7ad703af3a6a46257f1000c83507afd44e5a1cbc..b8b41cba76a7ef295cc86031b667f908a28fbded 100644 (file)
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -39,7 +39,7 @@
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
 #include <dn.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <mpi.h>
 #include <sign.h>
 #include <common.h>

diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 2700094399c646841191076a527b91da24e5cf29..e0a586a50153a9ee053d7102c7661594ad3660b2 100644 (file)
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -36,7 +36,7 @@
 #include <gnutls_str.h>
 #include <gnutls_datum.h>
 #include <dn.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <mpi.h>
 #include <common.h>
 #include <verify.h>

diff --git a/lib/x509/verify.h b/lib/x509/verify.h
index d7ca515163f511ae9a107284fe4a45dbc7384309..5bd9aa94f3301096bbdf8b226ff267fee6f3a41c 100644 (file)
--- a/lib/x509/verify.h
+++ b/lib/x509/verify.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,7 +22,7 @@
  *
  */
 
-#include "x509.h"
+#include "x509_int.h"
 
 int gnutls_x509_crt_is_issuer (gnutls_x509_crt_t cert,
                               gnutls_x509_crt_t issuer);

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 33362a56550cce02fad6144270ab3a5c41061aa4..0d2214eb9d5492f0d9d248ba6637ef12b424f464 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
  * Author: Nikos Mavrogiannopoulos, Simon Josefsson, Howard Chu
  *
  * This file is part of GNUTLS.
@@ -31,7 +31,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <x509.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <extensions.h>
 #include <libtasn1.h>

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