Merge crq.h into x509_int.h, avoid one trivial header file.

7 files changed, 14 insertions, 39 deletions

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 17475e629a..b27940dd4a 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -68,7 +68,7 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h	\
 	der.h errors.h gstr.h parser_aux.h element.h			\
 	errors_int.h int.h mem.h structure.h				\
 									\
-	common.h crq.h dsa.h mpi.h pkcs7.h rfc2818.h verify.h compat.h	\
+	common.h dsa.h mpi.h pkcs7.h rfc2818.h verify.h compat.h	\
 	dn.h extensions.h privkey.h sign.h				\
 									\
 	gnutls_extra.h openssl_compat.h					\
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 56c65de6d4..dfa62ffbd9 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -32,7 +32,7 @@ libgnutls_x509_la_SOURCES = crl.c dn.c common.c x509.c extensions.c	\
 	dsa.c rfc2818_hostname.c verify.c mpi.c privkey.c pkcs7.c	\
 	crq.c sign.c privkey_pkcs8.c pkcs12.c pkcs12_bag.c		\
 	pkcs12_encr.c x509_write.c crl_write.c dn.h common.h		\
-	x509_int.h extensions.h pkcs7.h verify.h mpi.h crq.h sign.h	\
+	x509_int.h extensions.h pkcs7.h verify.h mpi.h sign.h		\
 	privkey.h pkcs12.h rfc2818.h dsa.h output.c
 
 EXTRA_DIST = x509-api.texi
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 1faf2ab6a1..4744f94487 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <crq.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
 #include <sign.h>
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 85539db41f..6e249e1863 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <crq.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
 #include <sign.h>
diff --git a/lib/x509/crq.h b/lib/x509/crq.h
deleted file mode 100644
index ab36e6451a..0000000000
--- a/lib/x509/crq.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2003, 2004, 2005 Free Software Foundation
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GNUTLS.
- *
- * The GNUTLS library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
- * USA
- *
- */
-
-#include <gnutls/x509.h>
-
-typedef struct gnutls_x509_crq_int
-{
-  ASN1_TYPE crq;
-} gnutls_x509_crq_int;
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index 2f3bc92955..46c883e126 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -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
  *
@@ -46,6 +46,11 @@ typedef struct gnutls_x509_crt_int
   int use_extensions;
 } gnutls_x509_crt_int;
 
+typedef struct gnutls_x509_crq_int
+{
+  ASN1_TYPE crq;
+} gnutls_x509_crq_int;
+
 #define MAX_PRIV_PARAMS_SIZE 6	/* ok for RSA and DSA */
 
 /* parameters should not be larger than this limit */
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 87b810349d..63462dd6bd 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.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
  *
@@ -35,7 +35,7 @@
 #include <common.h>
 #include <gnutls_x509.h>
 #include <x509_b64.h>
-#include <crq.h>
+#include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
 #include <sign.h>