Fix use of deprecated types, for now and the future.

diff --git a/configure.ac b/configure.ac
index 21bc441b08dee5085b8cc45cc22c9173b5bc3582..b18f64407c581a23f8caadfda894e561bb37315d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -240,6 +240,8 @@ export WSTACK_CFLAGS
 export WARN_CFLAGS
 export use_cxx
 
+AC_DEFINE([GNUTLS_COMPAT_H], 1, [Make sure we don't use old features in code.])
+
 AC_CONFIG_SUBDIRS([lib])
 AC_CONFIG_SUBDIRS([libextra])
 

diff --git a/lib/configure.ac b/lib/configure.ac
index 68b509d2d4d819c3aeb3b5eeb59812e12b3b36b9..c21acde5a701166b2dacd8fe2bd52351b4e8d2c5 100644 (file)
--- a/lib/configure.ac
+++ b/lib/configure.ac
@@ -93,6 +93,8 @@ AC_SUBST([WARN_CFLAGS])
 AC_PROG_CXX
 AM_CONDITIONAL(ENABLE_CXX, test "$use_cxx" != "no")
 
+AC_DEFINE([GNUTLS_COMPAT_H], 1, [Make sure we don't use old features in code.])
+
 AC_CONFIG_FILES([
   Makefile
   gnutls.pc

diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
index 840084e0bb2783ce7825403a6c098080fb0fda36..7c10fbbc67f4cc7278d0a333a1bfd24e0f7d0fe6 100644 (file)
--- a/lib/gnutls_handshake.c
+++ b/lib/gnutls_handshake.c
@@ -314,7 +314,7 @@ _gnutls_negotiate_version (gnutls_session_t session,
 }
 
 int
-_gnutls_user_hello_func (gnutls_session session,
+_gnutls_user_hello_func (gnutls_session_t session,
                         gnutls_protocol_t adv_version)
 {
   int ret;

diff --git a/lib/gnutls_handshake.h b/lib/gnutls_handshake.h
index 5cff279addd4f162b3e84d274142cb5fe4337924..f1b1bd66cc3a6af3de001f9f5acda92ce8a18fee 100644 (file)
--- a/lib/gnutls_handshake.h
+++ b/lib/gnutls_handshake.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -50,8 +50,10 @@ int _gnutls_find_pk_algos_in_ciphersuites (opaque * data, int datalen);
 int _gnutls_server_select_suite (gnutls_session_t session, opaque * data,
                                 int datalen);
 
-int _gnutls_negotiate_version( gnutls_session_t session, gnutls_protocol_t adv_version);
-int _gnutls_user_hello_func( gnutls_session, gnutls_protocol_t adv_version);
+int _gnutls_negotiate_version (gnutls_session_t session,
+                              gnutls_protocol_t adv_version);
+int _gnutls_user_hello_func (gnutls_session_t session,
+                            gnutls_protocol_t adv_version);
 
 #define STATE session->internals.handshake_state
 /* This returns true if we have got there

diff --git a/lib/gnutls_str.h b/lib/gnutls_str.h
index 8b4910e9084ee7e3f959eb572282dd322de2dbf1..cf5b2f742d6d8451f6b825b6bb690fe45de49314 100644 (file)
--- a/lib/gnutls_str.h
+++ b/lib/gnutls_str.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -53,7 +53,7 @@ int _gnutls_string_append_data (gnutls_string *, const void *data,
                                size_t data_size);
 
 void _gnutls_string_get_data( gnutls_string *, void*, size_t *size);
-void _gnutls_string_get_datum( gnutls_string *, gnutls_datum*, size_t max_size);
+void _gnutls_string_get_datum( gnutls_string *, gnutls_datum_t *, size_t max_size);
 
 #ifndef __attribute__
 /* This feature is available in gcc versions 2.5 and later.  */

diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index dbf536a6cc78afa8085286ac8631169d6882abac..67d94db6c1a6eda9a8d629732fdbe532bad122d7 100644 (file)
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -21,10 +21,10 @@
 # MA 02110-1301, USA
 
 AM_CPPFLAGS = \
-       -I$(srcdir)/../gl \
-       -I$(builddir)/../gl \
-       -I$(srcdir)/../includes \
-       -I$(builddir)/../includes \
+       -I$(srcdir)/../gl               \
+       -I$(builddir)/../gl             \
+       -I$(srcdir)/../includes         \
+       -I$(builddir)/../includes       \
        -I$(srcdir)/..
 
 if ENABLE_MINITASN1

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index cd676e841c5d621e5db54a8a55f9d8ae285c8234..faeb298db6680d15eadfca1336c67c0f745d5f2b 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -126,7 +126,7 @@ check_schema (const char *oid)
  * an ASN.1 INTEGER of the x value.
  */
 inline static int
-_encode_privkey (gnutls_x509_privkey pkey, gnutls_datum_t * raw)
+_encode_privkey (gnutls_x509_privkey_t pkey, gnutls_datum_t * raw)
 {
   size_t size = 0;
   opaque *data = NULL;
@@ -853,7 +853,7 @@ error:
 /* Decodes an RSA privateKey from a PKCS8 structure.
  */
 static int
-_decode_pkcs8_rsa_key (ASN1_TYPE pkcs8_asn, gnutls_x509_privkey pkey)
+_decode_pkcs8_rsa_key (ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey)
 {
   int ret;
   gnutls_datum_t tmp;
@@ -883,7 +883,7 @@ error:
 /* Decodes an DSA privateKey and params from a PKCS8 structure.
  */
 static int
-_decode_pkcs8_dsa_key (ASN1_TYPE pkcs8_asn, gnutls_x509_privkey pkey)
+_decode_pkcs8_dsa_key (ASN1_TYPE pkcs8_asn, gnutls_x509_privkey_t pkey)
 {
   int ret;
   gnutls_datum_t tmp;

diff --git a/libextra/configure.ac b/libextra/configure.ac
index 837c68ff01a5330e274482ac1e601eb227f188d8..c3f594b3456a1e74fe4e432512c189f278ebe678 100644 (file)
--- a/libextra/configure.ac
+++ b/libextra/configure.ac
@@ -50,6 +50,8 @@ AC_SUBST([WERROR_CFLAGS])
 AC_SUBST([WSTACK_CFLAGS])
 AC_SUBST([WARN_CFLAGS])
 
+AC_DEFINE([GNUTLS_COMPAT_H], 1, [Make sure we don't use old features in code.])
+
 AC_CONFIG_FILES([
   Makefile
   gnutls-extra.pc