Kill HAVE_GNUTLS_PKCS12_SIMPLE_PARSE

Signed-off-by: David Woodhouse <dwmw2@infradead.org>

Makefile.am

@@ -27,7 +27,7 @@ openconnect_LDADD = libopenconnect.la $(SSL_LIBS) $(LIBXML2_LIBS) $(LIBPROXY_LIB
 library_srcs = ssl.c http.c http-auth.c auth-common.c library.c compat.c lzs.c mainloop.c script.c ntlm.c digest.c
 lib_srcs_cisco = auth.c cstp.c
 lib_srcs_juniper = oncp.c lzo.c auth-juniper.c
-lib_srcs_gnutls = gnutls.c gnutls_pkcs12.c gnutls_tpm.c
+lib_srcs_gnutls = gnutls.c gnutls_tpm.c
 lib_srcs_openssl = openssl.c openssl-pkcs11.c
 lib_srcs_win32 = tun-win32.c sspi.c
 lib_srcs_posix = tun.c

configure.ac

@@ -452,8 +452,6 @@ case "$ssl_library" in
 	CFLAGS="$CFLAGS $GNUTLS_CFLAGS"
 	esp=yes
 	dtls=yes
-	AC_CHECK_FUNC(gnutls_pkcs12_simple_parse,
-		      [AC_DEFINE(HAVE_GNUTLS_PKCS12_SIMPLE_PARSE, 1, [From GnuTLS 3.1.0])], [])
 	AC_CHECK_FUNC(gnutls_certificate_set_key,
 		      [AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_SET_KEY, 1, [From GnuTLS 3.0.4])], [])
 	AC_CHECK_FUNC(gnutls_pk_to_sign,

gnutls.h

@@ -24,21 +24,6 @@
 
 #include "openconnect-internal.h"
 
-#ifndef HAVE_GNUTLS_PKCS12_SIMPLE_PARSE
-/* If we're using a version of GnuTLS from before this was
-   exported, pull in our local copy. */
-int gnutls_pkcs12_simple_parse(gnutls_pkcs12_t p12, const char *password,
-			       gnutls_x509_privkey_t *key,
-			       gnutls_x509_crt_t **chain,
-			       unsigned int *chain_len,
-			       gnutls_x509_crt_t **extra_certs,
-			       unsigned int *extra_certs_len,
-			       gnutls_x509_crl_t *crl,
-			       unsigned int flags);
-
-#endif /* !HAVE_GNUTLS_PKCS12_SIMPLE_PARSE */
-
-
 #ifndef HAVE_GNUTLS_CERTIFICATE_SET_KEY
 int gtls2_tpm_sign_cb(gnutls_session_t sess, void *_vpninfo,
 		      gnutls_certificate_type_t cert_type,