--- lib/x509/crq.c.orig	2009-06-02 12:07:14.000000000 -0700
+++ lib/x509/crq.c	2009-08-27 13:18:48.000000000 -0700
@@ -621,7 +621,9 @@
 				      const char *oid, void *buf,
 				      size_t sizeof_buf)
 {
-  gnutls_datum data = { buf, sizeof_buf };
+  gnutls_datum data;
+  data.data = buf;
+  data.size = sizeof_buf;
 
   if (crq == NULL)
     {
--- lib/opencdk/verify.c.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/verify.c	2009-08-27 13:20:32.000000000 -0700
@@ -58,7 +58,7 @@
 };
 
 
-static int file_verify_clearsign (cdk_ctx_t, const char *, const char *);
+static cdk_error_t file_verify_clearsign (cdk_ctx_t, const char *, const char *);
 
 
 /**
--- lib/opencdk/pubkey.c.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/pubkey.c	2009-08-27 13:21:52.000000000 -0700
@@ -646,7 +646,7 @@
 
 
 /* Get the fingerprint of the packet if possible. */
-int
+cdk_error_t
 _cdk_pkt_get_fingerprint (cdk_packet_t pkt, byte * fpr)
 {
   if (!pkt || !fpr)
--- lib/opencdk/stream.c.orig	2009-07-22 11:26:40.000000000 -0700
+++ lib/opencdk/stream.c	2009-08-27 13:22:52.000000000 -0700
@@ -43,8 +43,8 @@
 /* This is the maximal amount of bytes we map. */
 #define MAX_MAP_SIZE 16777216
 
-static int stream_flush (cdk_stream_t s);
-static int stream_filter_write (cdk_stream_t s);
+static cdk_error_t stream_flush (cdk_stream_t s);
+static cdk_error_t stream_filter_write (cdk_stream_t s);
 static int stream_cache_flush (cdk_stream_t s, FILE * fp);
 struct stream_filter_s *filter_add (cdk_stream_t s, filter_fnct_t fnc,
 				    int type);
--- lib/opencdk/stream.h.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/stream.h	2009-08-27 13:24:32.000000000 -0700
@@ -38,7 +38,7 @@
 };
 
 /* Type definition for the filter function. */
-typedef int (*filter_fnct_t) (void * opaque, int ctl, FILE * in, FILE * out);
+typedef cdk_error_t (*filter_fnct_t) (void * opaque, int ctl, FILE * in, FILE * out);
 
 /* The stream filter context structure. */
 struct stream_filter_s 
--- lib/opencdk/packet.h.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/packet.h	2009-08-27 13:26:58.000000000 -0700
@@ -37,12 +37,12 @@
 void _cdk_free_userid (cdk_pkt_userid_t uid);
 void _cdk_free_signature( cdk_pkt_signature_t sig );
 cdk_prefitem_t _cdk_copy_prefs( const cdk_prefitem_t prefs );
-int _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
-int _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
-int _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
-int _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
-int _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
-int _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
+cdk_error_t _cdk_copy_userid( cdk_pkt_userid_t *dst, cdk_pkt_userid_t src );
+cdk_error_t _cdk_copy_pubkey( cdk_pkt_pubkey_t* dst, cdk_pkt_pubkey_t src );
+cdk_error_t _cdk_copy_seckey( cdk_pkt_seckey_t* dst, cdk_pkt_seckey_t src );
+cdk_error_t _cdk_copy_pk_to_sk( cdk_pkt_pubkey_t pk, cdk_pkt_seckey_t sk );
+cdk_error_t _cdk_copy_signature( cdk_pkt_signature_t* dst, cdk_pkt_signature_t src );
+cdk_error_t _cdk_pubkey_compare( cdk_pkt_pubkey_t a, cdk_pkt_pubkey_t b );
 
 #endif /* CDK_PACKET_H */
 
--- lib/opencdk/new-packet.c.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/new-packet.c	2009-08-27 13:28:14.000000000 -0700
@@ -388,7 +388,7 @@
   u = cdk_calloc (1, sizeof *u + strlen (src->name) + 2);
   if (!u)
     return CDK_Out_Of_Core;
-  u->name = (void*)u + sizeof(*u);
+  u->name = (char*)u + sizeof(*u);
 
   memcpy (u, src, sizeof *u);
   memcpy (u->name, src->name, strlen (src->name));
@@ -627,7 +627,7 @@
   s = cdk_calloc (1, sizeof *s + size + 2);
   if (!s)
     return NULL;
-  s->d = (void*)s + sizeof(*s);
+  s->d = (char*)s + sizeof(*s);
 
   return s;
 }
--- lib/opencdk/read-packet.c.orig	2009-06-02 11:59:32.000000000 -0700
+++ lib/opencdk/read-packet.c	2009-08-27 13:29:22.000000000 -0700
@@ -836,7 +836,7 @@
       *ret_pt = pt = cdk_realloc (pt, sizeof *pt + pt->namelen + 2);
       if (!pt)
 	return CDK_Out_Of_Core;
-      pt->name = (void*)pt + sizeof(*pt);
+      pt->name = (char*)pt + sizeof(*pt);
       rc = stream_read (inp, pt->name, pt->namelen, &nread);
       if (rc)
 	return rc;
@@ -998,7 +998,7 @@
 				     + pkt->pktlen + 16 + 1);
       if (!pkt->pkt.user_id)
 	return CDK_Out_Of_Core;
-      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
+      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
 
       rc = read_attribute (inp, pktlen, pkt->pkt.user_id);
       pkt->pkttype = CDK_PKT_ATTRIBUTE;
@@ -1009,7 +1009,7 @@
 				     + pkt->pktlen + 1);
       if (!pkt->pkt.user_id)
 	return CDK_Out_Of_Core;
-      pkt->pkt.user_id->name = (void*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
+      pkt->pkt.user_id->name = (char*)pkt->pkt.user_id + sizeof(*pkt->pkt.user_id);
       rc = read_user_id (inp, pktlen, pkt->pkt.user_id);
       break;