* Added CRL verification functionality to certtool.

* Added the FSF copyright notices.
* Moved all the compatibility interface to the openssl
  compatibility library.

4 files changed, 23 insertions, 75 deletions

diff --git a/includes/Makefile.am b/includes/Makefile.am
index 7b9ff9133d..cb35de5471 100644
--- a/includes/Makefile.am
+++ b/includes/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 nobase_include_HEADERS = gnutls/extra.h gnutls/gnutls.h $(OPENSSL_H) \
-	gnutls/x509.h gnutls/compat8.h gnutls/pkcs12.h \
+	gnutls/x509.h gnutls/pkcs12.h \
 	gnutls/openpgp.h
 
 if ENABLE_OPENSSL
diff --git a/includes/gnutls/Makefile.am b/includes/gnutls/Makefile.am
index e65e63205a..484ff83428 100644
--- a/includes/gnutls/Makefile.am
+++ b/includes/gnutls/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = extra.h openssl.h gnutls.h x509.h compat8.h pkcs12.h openpgp.h
+EXTRA_DIST = extra.h openssl.h gnutls.h x509.h pkcs12.h openpgp.h
diff --git a/includes/gnutls/compat8.h b/includes/gnutls/compat8.h
deleted file mode 100644
index 23e2b37b30..0000000000
--- a/includes/gnutls/compat8.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef GNUTLS_COMPAT8_H
-# define GNUTLS_COMPAT8_H
-
-/* Extra definitions */
-
-#define GNUTLS_X509_CN_SIZE 256
-#define GNUTLS_X509_C_SIZE 3
-#define GNUTLS_X509_O_SIZE 256
-#define GNUTLS_X509_OU_SIZE 256
-#define GNUTLS_X509_L_SIZE 256
-#define GNUTLS_X509_S_SIZE 256
-#define GNUTLS_X509_EMAIL_SIZE 256
-
-#ifdef __GNUC__
-
-#define _GT_GCC_VERSION (__GNUC__ * 10000 \
-                             + __GNUC_MINOR__ * 100 \
-                             + __GNUC_PATCHLEVEL__)
-
-#if _GT_GCC_VERSION >= 30100
-# ifndef DEPRECATED
-#  define DEPRECATED __attribute__ ((__deprecated__))
-# endif
-#endif
-
-#endif
-
-#ifndef DEPRECATED
-# define DEPRECATED
-#endif
-
-typedef struct {
-	char common_name[GNUTLS_X509_CN_SIZE];
-	char country[GNUTLS_X509_C_SIZE];
-	char organization[GNUTLS_X509_O_SIZE];
-	char organizational_unit_name[GNUTLS_X509_OU_SIZE];
-	char locality_name[GNUTLS_X509_L_SIZE];
-	char state_or_province_name[GNUTLS_X509_S_SIZE];
-	char email[GNUTLS_X509_EMAIL_SIZE];
-} gnutls_x509_dn;
-
-typedef struct {
-	char name[GNUTLS_X509_CN_SIZE];
-	char email[GNUTLS_X509_CN_SIZE];
-} gnutls_openpgp_name;
-
-int gnutls_x509_extract_dn( const gnutls_datum*, gnutls_x509_dn*) DEPRECATED;
-int gnutls_x509_extract_dn_string(const gnutls_datum * idn,
-        char *buf, unsigned int sizeof_buf) DEPRECATED;
-int gnutls_x509_extract_certificate_dn( const gnutls_datum*, gnutls_x509_dn*) DEPRECATED;
-int gnutls_x509_extract_certificate_dn_string(char *buf, unsigned int sizeof_buf,
-   const gnutls_datum * cert, int issuer) DEPRECATED;
-int gnutls_x509_extract_certificate_issuer_dn(  const gnutls_datum*, gnutls_x509_dn *) DEPRECATED;
-int gnutls_x509_extract_certificate_version( const gnutls_datum*) DEPRECATED;
-int gnutls_x509_extract_certificate_serial(const gnutls_datum * cert, char* result, int* result_size) DEPRECATED;
-time_t gnutls_x509_extract_certificate_activation_time( const gnutls_datum*);
-time_t gnutls_x509_extract_certificate_expiration_time( const gnutls_datum*);
-int gnutls_x509_extract_certificate_subject_alt_name( const gnutls_datum*, int seq, char*, int*) DEPRECATED;
-int gnutls_x509_pkcs7_extract_certificate(const gnutls_datum * pkcs7_struct, int indx, char* certificate, int* certificate_size) DEPRECATED;
-int gnutls_x509_extract_certificate_pk_algorithm( const gnutls_datum * cert, int* bits) DEPRECATED;
-int gnutls_x509_extract_certificate_ca_status(const gnutls_datum * cert) DEPRECATED;
-int gnutls_x509_extract_key_pk_algorithm( const gnutls_datum * key) DEPRECATED;
-
-int gnutls_x509_verify_certificate( const gnutls_datum* cert_list, int cert_list_length, const gnutls_datum * CA_list, int CA_list_length, const gnutls_datum* CRL_list, int CRL_list_length) DEPRECATED;
-
-#define gnutls_x509_fingerprint gnutls_fingerprint
-#define gnutls_x509_certificate_format gnutls_x509_crt_fmt
-
-int gnutls_x509_extract_key_pk_algorithm( const gnutls_datum * key) DEPRECATED;
-
-#define gnutls_certificate_set_rsa_params gnutls_certificate_set_rsa_export_params
-
-#endif
diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index eb4667af9c..07d2e510c3 100644
--- a/includes/gnutls/openssl.h
+++ b/includes/gnutls/openssl.h
@@ -36,6 +36,27 @@ extern "C" {
 #include <gnutls/gnutls.h>
 #include <gcrypt.h>
 
+/* Extra definitions that do not longer exist in gnutls.
+ */
+#define GNUTLS_X509_CN_SIZE 256
+#define GNUTLS_X509_C_SIZE 3
+#define GNUTLS_X509_O_SIZE 256
+#define GNUTLS_X509_OU_SIZE 256
+#define GNUTLS_X509_L_SIZE 256
+#define GNUTLS_X509_S_SIZE 256
+#define GNUTLS_X509_EMAIL_SIZE 256
+
+typedef struct {
+	char common_name[GNUTLS_X509_CN_SIZE];
+	char country[GNUTLS_X509_C_SIZE];
+	char organization[GNUTLS_X509_O_SIZE];
+	char organizational_unit_name[GNUTLS_X509_OU_SIZE];
+	char locality_name[GNUTLS_X509_L_SIZE];
+	char state_or_province_name[GNUTLS_X509_S_SIZE];
+	char email[GNUTLS_X509_EMAIL_SIZE];
+} gnutls_x509_dn;
+
+
 #define OPENSSL_VERSION_NUMBER (0x0090604F)
 #define SSLEAY_VERSION_NUMBER OPENSSL_VERSION_NUMBER
 #define OPENSSL_VERSION_TEXT ("GNUTLS " LIBGNUTLS_VERSION " ")