Remove gnutls_extra.h, not needed anymore.

Fixes build failure in libextra that looked for opencdk.h (via
auth_cert.h).  Reported by Roman Bogorodskiy <novel@FreeBSD.org>.

5 files changed, 7 insertions, 55 deletions

diff --git a/NEWS b/NEWS
index c30c0d4808..d49a13c1d2 100644
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,9 @@ See the end for copying conditions.
 
 * Version 2.3.3 (unreleased)
 
+** Fix build failure in libextra/gnutls_extra.c that needed opencdk.h.
+Reported by Roman Bogorodskiy <novel@FreeBSD.org>.
+
 ** No longer compiled using -D_REENTRANT -D_THREAD_SAFE.
 We could not find any modern justification for enabling these flags by
 default.  If you know of some platform that needs one of the flags to
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 9416f480f6..30f859484e 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -74,7 +74,7 @@ IGNORE_HFILES=debug.h gnutls_compress.h defines.h gnutls_cipher.h	\
 									\
 	common.h compat.h						\
 									\
-	gnutls_extra.h openssl_compat.h					\
+	openssl_compat.h					\
 									\
 	cipher.h context.h filters.h main.h md.h packet.h		\
 	stream.h types.h						\
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 5d03a9f512..c898b55587 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# 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
 #
@@ -102,7 +102,7 @@ libgnutls_extra_la_LDFLAGS += \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
 	$(LZO_LIBS)
 
-libgnutls_extra_la_SOURCES += gnutls_extra.h libgnutls-extra.vers
+libgnutls_extra_la_SOURCES += libgnutls-extra.vers
 
 libgnutls_extra_la_LIBADD += ../lgl/liblgnu.la ../lib/libgnutls.la
 
diff --git a/libextra/gnutls_extra.c b/libextra/gnutls_extra.c
index da22415a79..369e5d2f7b 100644
--- a/libextra/gnutls_extra.c
+++ b/libextra/gnutls_extra.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001, 2004, 2005, 2007 Free Software Foundation
+ * Copyright (C) 2001, 2004, 2005, 2007, 2008 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -22,7 +22,6 @@
 #include <gnutls_int.h>
 #include <gnutls_errors.h>
 #include <gnutls_extensions.h>
-#include <gnutls_extra.h>
 #include <gnutls_algorithms.h>
 #ifdef USE_LZO
 # ifdef USE_MINILZO
diff --git a/libextra/gnutls_extra.h b/libextra/gnutls_extra.h
deleted file mode 100644
index de7fc8891c..0000000000
--- a/libextra/gnutls_extra.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
- *
- * Author: Nikos Mavrogiannopoulos
- *
- * This file is part of GNUTLS-EXTRA.
- *
- * GNUTLS-EXTRA is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * GNUTLS-EXTRA 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with GNUTLS-EXTRA; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- *
- */
-
-#include <auth_cert.h>
-
-typedef int (*OPENPGP_VERIFY_KEY_FUNC) (const
-					gnutls_certificate_credentials_t,
-					const gnutls_datum_t *, int,
-					unsigned int *);
-
-typedef time_t (*OPENPGP_KEY_CREATION_TIME_FUNC) (const gnutls_datum_t *);
-typedef time_t (*OPENPGP_KEY_EXPIRATION_TIME_FUNC) (const gnutls_datum_t *);
-typedef int (*OPENPGP_KEY_REQUEST) (gnutls_session_t, gnutls_datum_t *,
-				    const gnutls_certificate_credentials_t,
-				    opaque *, int);
-
-typedef int (*OPENPGP_FINGERPRINT) (const gnutls_datum_t *,
-				    unsigned char *, size_t *);
-
-typedef int (*OPENPGP_RAW_KEY_TO_GCERT) (gnutls_cert *,
-					 const gnutls_datum_t *);
-typedef int (*OPENPGP_RAW_PRIVKEY_TO_GKEY) (gnutls_privkey *,
-					    const gnutls_datum_t *);
-
-typedef int (*OPENPGP_KEY_TO_GCERT) (gnutls_cert *, gnutls_openpgp_crt_t);
-typedef int (*OPENPGP_PRIVKEY_TO_GKEY) (gnutls_privkey *,
-					gnutls_openpgp_privkey_t);
-typedef void (*OPENPGP_KEY_DEINIT) (gnutls_openpgp_crt_t);
-typedef void (*OPENPGP_PRIVKEY_DEINIT) (gnutls_openpgp_privkey_t);