Get public prototypes from gnutls/x509.h instead.

4 files changed, 7 insertions, 53 deletions

diff --git a/lib/x509/pkcs7.h b/lib/x509/pkcs7.h
index 1c1adc6e62..d51858e317 100644
--- a/lib/x509/pkcs7.h
+++ b/lib/x509/pkcs7.h
@@ -22,17 +22,8 @@
  *
  */
 
+#include <gnutls/x509.h>
+
 typedef struct gnutls_pkcs7_int {
-    ASN1_TYPE pkcs7;
+  ASN1_TYPE pkcs7;
 } gnutls_pkcs7_int;
-
-typedef struct gnutls_pkcs7_int *gnutls_pkcs7_t;
-
-int gnutls_pkcs7_init(gnutls_pkcs7_t * pkcs7);
-void gnutls_pkcs7_deinit(gnutls_pkcs7_t pkcs7);
-int gnutls_pkcs7_import(gnutls_pkcs7_t pkcs7, const gnutls_datum_t * data,
-			gnutls_x509_crt_fmt_t format);
-int gnutls_pkcs7_get_crt_raw(gnutls_pkcs7_t pkcs7,
-			     int indx, void *certificate,
-			     size_t * certificate_size);
-int gnutls_pkcs7_get_crt_count(gnutls_pkcs7_t pkcs7);
diff --git a/lib/x509/privkey.h b/lib/x509/privkey.h
index d510270e0c..60ea116ba0 100644
--- a/lib/x509/privkey.h
+++ b/lib/x509/privkey.h
@@ -22,21 +22,7 @@
  *
  */
 
-typedef enum gnutls_pkcs_encrypt_flags_t {
-    GNUTLS_PKCS_PLAIN = 1,	/* if set the private key will not
-				 * be encrypted.
-				 */
-    GNUTLS_PKCS_USE_PKCS12_3DES = 2,
-    GNUTLS_PKCS_USE_PKCS12_ARCFOUR = 4,
-    GNUTLS_PKCS_USE_PKCS12_RC2_40 = 8,
-    GNUTLS_PKCS_USE_PBES2_3DES = 16
-} gnutls_pkcs_encrypt_flags_t;
+#include <gnutls/x509.h>
 
-int gnutls_x509_privkey_import(gnutls_x509_privkey_t key,
-			       const gnutls_datum_t * data,
-			       gnutls_x509_crt_fmt_t format);
-ASN1_TYPE _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t *
-					       raw_key,
+ASN1_TYPE _gnutls_privkey_decode_pkcs1_rsa_key(const gnutls_datum_t *raw_key,
 					       gnutls_x509_privkey_t pkey);
-int gnutls_x509_privkey_cpy(gnutls_x509_privkey_t dst,
-			    gnutls_x509_privkey_t src);
diff --git a/lib/x509/verify.h b/lib/x509/verify.h
index ebfc7577d4..deb28e8638 100644
--- a/lib/x509/verify.h
+++ b/lib/x509/verify.h
@@ -24,28 +24,8 @@
 
 #include "x509.h"
 
-typedef enum gnutls_certificate_verify_flags {
-    GNUTLS_VERIFY_DISABLE_CA_SIGN = 1,
-    GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT = 2,
-    GNUTLS_VERIFY_DO_NOT_ALLOW_SAME = 4,
-    GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT = 8
-} gnutls_certificate_verify_flags;
-
 int gnutls_x509_crt_is_issuer(gnutls_x509_crt_t cert,
     gnutls_x509_crt_t issuer);
-int gnutls_x509_crt_verify(gnutls_x509_crt_t cert,
-    const gnutls_x509_crt_t * CA_list,
-    int CA_list_length, unsigned int flags,
-    unsigned int *verify);
-int gnutls_x509_crl_verify(gnutls_x509_crl_t crl,
-    const gnutls_x509_crt_t * CA_list, int CA_list_length, 
-    unsigned int flags, unsigned int *verify);
-
-int gnutls_x509_crt_list_verify(const gnutls_x509_crt_t * cert_list,
-    int cert_list_length, const gnutls_x509_crt_t * CA_list,
-    int CA_list_length, const gnutls_x509_crl_t * CRL_list,
-    int CRL_list_length, unsigned int flags, unsigned int *verify);
-
 int _gnutls_x509_verify_signature(const gnutls_datum_t * tbs,
     const gnutls_datum_t * signature, gnutls_x509_crt_t issuer);
 int _gnutls_x509_privkey_verify_signature(const gnutls_datum_t * tbs,
diff --git a/lib/x509/x509.h b/lib/x509/x509.h
index 999a600536..c1b911a2f5 100644
--- a/lib/x509/x509.h
+++ b/lib/x509/x509.h
@@ -25,6 +25,8 @@
 #ifndef X509_H
 # define X509_H
 
+#include <gnutls/x509.h>
+
 #define HASH_OID_SHA1 "1.3.14.3.2.26"
 #define HASH_OID_MD5 "1.2.840.113549.2.5"
 #define HASH_OID_MD2 "1.2.840.113549.2.2"
@@ -39,11 +41,6 @@ typedef struct gnutls_x509_crt_int {
     int use_extensions;
 } gnutls_x509_crt_int;
 
-typedef enum gnutls_certificate_import_flags {
-    GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED=1
-} gnutls_certificate_import_flags;
-                                 
-
 #define MAX_PRIV_PARAMS_SIZE 6	/* ok for RSA and DSA */
 
 /* parameters should not be larger than this limit */