Move sign.h stuff to x509_int.h.

9 files changed, 17 insertions, 44 deletions

diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index b27940dd4a..cc2fe3e14b 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -69,7 +69,7 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h	\
 	errors_int.h int.h mem.h structure.h				\
 									\
 	common.h dsa.h mpi.h pkcs7.h rfc2818.h verify.h compat.h	\
-	dn.h extensions.h privkey.h sign.h				\
+	dn.h extensions.h privkey.h					\
 									\
 	gnutls_extra.h openssl_compat.h					\
 									\
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index dfa62ffbd9..ab6cb5b5eb 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -32,8 +32,8 @@ 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 sign.h		\
-	privkey.h pkcs12.h rfc2818.h dsa.h output.c
+	x509_int.h extensions.h pkcs7.h verify.h mpi.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 4744f94487..be74c8e8ff 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -38,7 +38,6 @@
 #include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
-#include <sign.h>
 #include <extensions.h>
 #include <libtasn1.h>
 
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 6e249e1863..0c4cf4dc1f 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -38,7 +38,6 @@
 #include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
-#include <sign.h>
 #include <extensions.h>
 #include <libtasn1.h>
 
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index e6c76b61ad..0f710017e2 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -35,7 +35,6 @@
 #include <dn.h>
 #include <mpi.h>
 #include <extensions.h>
-#include <sign.h>
 #include <dsa.h>
 #include <verify.h>
 
diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index b8b41cba76..e60b92ae62 100644
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -41,7 +41,6 @@
 #include <dn.h>
 #include <x509_int.h>
 #include <mpi.h>
-#include <sign.h>
 #include <common.h>
 #include <verify.h>
 
diff --git a/lib/x509/sign.h b/lib/x509/sign.h
deleted file mode 100644
index e1bf46d405..0000000000
--- a/lib/x509/sign.h
+++ /dev/null
@@ -1,36 +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
- *
- */
-
-int _gnutls_x509_sign (const gnutls_datum_t * tbs,
-		       gnutls_digest_algorithm_t hash,
-		       gnutls_x509_privkey_t signer,
-		       gnutls_datum_t * signature);
-int _gnutls_x509_sign_tbs (ASN1_TYPE cert, const char *tbs_name,
-			   gnutls_digest_algorithm_t hash,
-			   gnutls_x509_privkey_t signer,
-			   gnutls_datum_t * signature);
-int _gnutls_x509_pkix_sign (ASN1_TYPE src, const char *src_name,
-			    gnutls_digest_algorithm_t,
-			    gnutls_x509_crt_t issuer,
-			    gnutls_x509_privkey_t issuer_key);
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index a29e645605..ed88426f72 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -113,4 +113,18 @@ int _gnutls_x509_crl_cpy (gnutls_x509_crl_t dest, gnutls_x509_crl_t src);
 int _gnutls_x509_crl_get_raw_issuer_dn (gnutls_x509_crl_t crl,
 					gnutls_datum_t * dn);
 
+/* sign.c */
+int _gnutls_x509_sign (const gnutls_datum_t * tbs,
+		       gnutls_digest_algorithm_t hash,
+		       gnutls_x509_privkey_t signer,
+		       gnutls_datum_t * signature);
+int _gnutls_x509_sign_tbs (ASN1_TYPE cert, const char *tbs_name,
+			   gnutls_digest_algorithm_t hash,
+			   gnutls_x509_privkey_t signer,
+			   gnutls_datum_t * signature);
+int _gnutls_x509_pkix_sign (ASN1_TYPE src, const char *src_name,
+			    gnutls_digest_algorithm_t,
+			    gnutls_x509_crt_t issuer,
+			    gnutls_x509_privkey_t issuer_key);
+
 #endif
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 63462dd6bd..90e1b054ef 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -38,7 +38,6 @@
 #include <x509_int.h>
 #include <dn.h>
 #include <mpi.h>
-#include <sign.h>
 #include <extensions.h>
 #include <libtasn1.h>