Compatibility header for gnutls4 is no longer included in gnutls.h. Added deprecated...

diff --git a/configure.in b/configure.in
index 2724047500a506fa0228d256b1d2081b6db3e9de..a9a1f6bdcb19ed57864b2a0608394ec91d46e39a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -132,7 +132,7 @@ affect compiling.])
 if test $ac_cv_c_compiler_gnu != no; then
 
        if test x$opt_developer_mode = xyes; then
-         CFLAGS="${CFLAGS} -g -std=c99 -pedantic -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
+         CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
        else
          CFLAGS="${CFLAGS} -O2 -finline-functions"
        fi

diff --git a/includes/gnutls/compat8.h b/includes/gnutls/compat8.h
index 3fe274135b676f747b040cb8bc253395cbf04329..a26c9dc9680b4958a43725eb8ff4ccc44ab340a2 100644 (file)
--- a/includes/gnutls/compat8.h
+++ b/includes/gnutls/compat8.h
@@ -11,6 +11,24 @@
 #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];
@@ -19,49 +37,49 @@ typedef struct {
        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;
+} gnutls_x509_dn DEPRECATED;
 
 typedef struct {
        char name[GNUTLS_X509_CN_SIZE];
        char email[GNUTLS_X509_CN_SIZE];
-} gnutls_openpgp_name; 
+} gnutls_openpgp_name DEPRECATED;
 
-int gnutls_x509_extract_dn( const gnutls_datum*, gnutls_x509_dn*);
+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);
-int gnutls_x509_extract_certificate_dn( const gnutls_datum*, gnutls_x509_dn*);
+        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);
-int gnutls_x509_extract_certificate_issuer_dn(  const gnutls_datum*, gnutls_x509_dn *);
-int gnutls_x509_extract_certificate_version( const gnutls_datum*);
-int gnutls_x509_extract_certificate_serial(const gnutls_datum * cert, char* result, int* result_size);
-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*);
-int gnutls_x509_pkcs7_extract_certificate(const gnutls_datum * pkcs7_struct, int indx, char* certificate, int* certificate_size);
-int gnutls_x509_extract_certificate_pk_algorithm( const gnutls_datum * cert, int* bits);
-int gnutls_x509_extract_certificate_ca_status(const gnutls_datum * cert);
-int gnutls_x509_extract_key_pk_algorithm( const gnutls_datum * key);
-
-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);
+   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*) DEPRECATED;
+time_t gnutls_x509_extract_certificate_expiration_time( const gnutls_datum*) DEPRECATED;
+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;
 int gnutls_x509_check_certificates_hostname(const gnutls_datum * cert,
-                                const char *hostname);
+                                const char *hostname) 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);
+int gnutls_x509_extract_key_pk_algorithm( const gnutls_datum * key) DEPRECATED;
 
 int gnutls_rsa_params_set(gnutls_rsa_params rsa_params, 
        gnutls_datum m, gnutls_datum e, gnutls_datum d, 
        gnutls_datum p, gnutls_datum q, gnutls_datum u,
-       int bits);
+       int bits) DEPRECATED;
 int gnutls_rsa_params_generate(gnutls_datum * m, gnutls_datum *e,
        gnutls_datum *d, gnutls_datum *p, gnutls_datum* q, 
-       gnutls_datum* u, int bits);
+       gnutls_datum* u, int bits) DEPRECATED;
 
-int gnutls_dh_params_set( gnutls_dh_params, gnutls_datum prime, gnutls_datum generator, int bits);
-int gnutls_dh_params_generate( gnutls_datum* prime, gnutls_datum* generator, int bits);
+int gnutls_dh_params_set( gnutls_dh_params, gnutls_datum prime, gnutls_datum generator, int bits) DEPRECATED;
+int gnutls_dh_params_generate( gnutls_datum* prime, gnutls_datum* generator, int bits) DEPRECATED;
 
 #define gnutls_certificate_set_rsa_params gnutls_certificate_set_rsa_export_params
 

diff --git a/includes/gnutls/x509.h b/includes/gnutls/x509.h
index 59db8800772233ca2b915dc7f8a2129284dac91f..a26222cefa80ea0a1f3ac7a63d8545d13c00f96a 100644 (file)
--- a/includes/gnutls/x509.h
+++ b/includes/gnutls/x509.h
@@ -56,11 +56,11 @@ int gnutls_x509_crt_export( gnutls_x509_crt cert,
 int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt cert, char *buf,
         size_t *sizeof_buf);
 int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt cert, 
-       const char* oid, int indx, char *buf, size_t *sizeof_buf);
+       const char* oid, int indx, void *buf, size_t *sizeof_buf);
 int gnutls_x509_crt_get_dn(gnutls_x509_crt cert, char *buf,
         size_t *sizeof_buf);
-int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, 
-       const char* oid, int indx, char *buf, size_t *sizeof_buf);
+int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
+       int indx, void *buf, size_t *sizeof_buf);
 int gnutls_x509_crt_check_hostname(gnutls_x509_crt cert,
                                 const char *hostname);
 
@@ -110,9 +110,9 @@ int gnutls_x509_crt_to_xml(gnutls_x509_crt cert, gnutls_datum* res, int detail);
 /* X.509 Certificate writing.
  */
 int gnutls_x509_crt_set_dn_by_oid(gnutls_x509_crt crt, const char* oid, 
-       const char *name, unsigned int sizeof_name);
+       const void *name, unsigned int sizeof_name);
 int gnutls_x509_crt_set_issuer_dn_by_oid(gnutls_x509_crt crt, const char* oid, 
-       const char *name, unsigned int sizeof_name);
+       const void *name, unsigned int sizeof_name);
 int gnutls_x509_crt_set_version(gnutls_x509_crt crt, unsigned int version);
 int gnutls_x509_crt_set_key(gnutls_x509_crt crt, gnutls_x509_privkey key);
 int gnutls_x509_crt_set_ca_status(gnutls_x509_crt crt, unsigned int ca);
@@ -149,7 +149,7 @@ int gnutls_x509_crl_export( gnutls_x509_crl crl,
 int gnutls_x509_crl_get_issuer_dn(const gnutls_x509_crl crl, 
        char *buf, size_t *sizeof_buf);
 int gnutls_x509_crl_get_issuer_dn_by_oid(gnutls_x509_crl crl, 
-       const char* oid, int indx, char *buf, size_t *sizeof_buf);
+       const char* oid, int indx, void *buf, size_t *sizeof_buf);
 
 int gnutls_x509_crl_get_signature_algorithm(gnutls_x509_crl crl);
 int gnutls_x509_crl_get_version(gnutls_x509_crl crl);
@@ -292,9 +292,9 @@ int gnutls_x509_crq_get_pk_algorithm( gnutls_x509_crq crq, unsigned int* bits);
 int gnutls_x509_crq_get_dn(gnutls_x509_crq crq, char *buf,
                                         size_t *sizeof_buf);
 int gnutls_x509_crq_get_dn_by_oid(gnutls_x509_crq crq, const char* oid, 
-       int indx, char *buf, size_t *sizeof_buf);
+       int indx, void *buf, size_t *sizeof_buf);
 int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq crq, const char* oid, 
-       const char *name, unsigned int sizeof_name);
+       const void *name, unsigned int sizeof_name);
 int gnutls_x509_crq_set_version(gnutls_x509_crq crq, unsigned int version);
 int gnutls_x509_crq_set_key(gnutls_x509_crq crq, gnutls_x509_privkey key);
 int gnutls_x509_crq_sign(gnutls_x509_crq crq, gnutls_x509_privkey key);

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index a67147286c7955d4860e136ab616eda41f3e999e..aecd2286d766fdab401b77b29d3e27c1d32ca241 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -39,9 +39,6 @@ extern "C" {
 
 #define LIBGNUTLS_VERSION "@VERSION@"
 
-/* For backwards compatibility */
-#include <gnutls/compat4.h>
-
 #ifndef HAVE_SIZE_T
 # define HAVE_SIZE_T
 @DEFINE_SIZE_T@
@@ -180,6 +177,7 @@ typedef struct {
        unsigned int size;
 } gnutls_datum;
 
+
 typedef struct {
        const unsigned char * data;
        unsigned int size;

diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index 0e7ad218c5819c765108cc251278a5bc35509241..d657dc27b5990d976398f8f8eed8b7c2e6a8db44 100644 (file)
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -405,12 +405,12 @@ int gnutls_x509_crq_get_challenge_password(gnutls_x509_crq crq,
 int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq crq, const char* oid, 
        const void *data, unsigned int sizeof_data)
 {
-       if (sizeof_name == 0 || name == NULL || crq == NULL) {
+       if (sizeof_data == 0 || data == NULL || crq == NULL) {
                return GNUTLS_E_INVALID_REQUEST;
        }
        
        return _gnutls_x509_set_dn_oid( crq->crq, "certificationRequestInfo.subject", oid,
-               name, sizeof_name);
+               data, sizeof_data);
 }
 
 /**

diff --git a/lib/x509/crq.h b/lib/x509/crq.h
index 94c6915c4174082bf1fef2d94c5990b9aff3949d..956d4e173562541b0e31320bb9da932e88606873 100644 (file)
--- a/lib/x509/crq.h
+++ b/lib/x509/crq.h
@@ -8,7 +8,7 @@ typedef struct gnutls_x509_crq_int {
 typedef struct gnutls_x509_crq_int *gnutls_x509_crq;
 
 int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
-       int indx, char *buf, size_t *sizeof_buf);
+       int indx, void *buf, size_t *sizeof_buf);
 
 int gnutls_x509_crq_init(gnutls_x509_crq * crq);
 void gnutls_x509_crq_deinit(gnutls_x509_crq crq);

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 54ca843c47715df8b2483ba29b88de6187cec3e4..82d385445b949b1964c8305a6524d0dd75094c71 100644 (file)
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -261,7 +261,7 @@ int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt cert, char *buf,
   *
   **/
 int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
-       int indx, char *buf, size_t *sizeof_buf)
+       int indx, void *buf, size_t *sizeof_buf)
 {
        if (cert==NULL) {
                gnutls_assert();

diff --git a/lib/x509/x509.h b/lib/x509/x509.h
index 93b068278f5e95f0e9f202dbb9a54e5dd56b2114..5ab26da72b148843eef0e6bc5cfc246a92b36e17 100644 (file)
--- a/lib/x509/x509.h
+++ b/lib/x509/x509.h
@@ -59,11 +59,11 @@ typedef struct gnutls_x509_crl_int *gnutls_x509_crl;
 typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey;
 
 int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
-       int indx, char *buf, size_t *sizeof_buf);
+       int indx, void *buf, size_t *sizeof_buf);
 int gnutls_x509_crt_get_subject_alt_name(gnutls_x509_crt cert, 
        int seq, char *ret, size_t *ret_size, unsigned int* critical);
 int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
-       int indx, char *buf, size_t *sizeof_buf);
+       int indx, void *buf, size_t *sizeof_buf);
 int gnutls_x509_crt_get_ca_status(gnutls_x509_crt cert, unsigned int* critical);
 int gnutls_x509_crt_get_pk_algorithm( gnutls_x509_crt cert, unsigned int* bits);