From: Simon Josefsson <simon@josefsson.org>
Date: Mon, 25 Feb 2008 15:32:09 +0000 (+0100)
Subject: Rename lib/x509/x509.h to x509_int.h.
X-Git-Tag: gnutls_2_3_2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0b79875dfceeedca7946a0e8a17dd6ced20ffc8a;p=thirdparty%2Fgnutls.git

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 27f67c985c..5258e2be76 100644
--- 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 17c47840a5..1f24ae100e 100644
--- 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 75f7e21f60..426554cc89 100644
--- 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 46e4ad75ce..f15c36982c 100644
--- 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 39c47536c2..f78b5c6277 100644
--- 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 e5f246093a..6e7536d651 100644
--- 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 ecffca3211..cb3f13f236 100644
--- 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 190615e109..d0fc52e32d 100644
--- 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 785d7e022c..c8bd72a643 100644
--- 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 75a1110aaf..42e709f947 100644
--- 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 a9e9d13069..e6c76b61ad 100644
--- 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 349d4cea20..350fb5e272 100644
--- 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 a3ddde184c..f2fd3acad8 100644
--- 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 7ad703af3a..b8b41cba76 100644
--- 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 2700094399..e0a586a501 100644
--- 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 d7ca515163..5bd9aa94f3 100644
--- 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 33362a5655..0d2214eb9d 100644
--- 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