Use OpenCDK 0.6.6.

5 files changed, 11 insertions, 10 deletions

diff --git a/libextra/opencdk/cipher.c b/libextra/opencdk/cipher.c
index 1dc1771b02..de58cc07d6 100644
--- a/libextra/opencdk/cipher.c
+++ b/libextra/opencdk/cipher.c
@@ -204,7 +204,7 @@ write_mdc_packet (FILE *out, cipher_filter_t *cfx)
 }
   
 
-static __inline__ int
+static inline int
 num2bits (size_t n)
 {
   size_t i;
diff --git a/libextra/opencdk/keydb.c b/libextra/opencdk/keydb.c
index 8b04d3f6ac..acebd56fff 100644
--- a/libextra/opencdk/keydb.c
+++ b/libextra/opencdk/keydb.c
@@ -1901,10 +1901,10 @@ classify_data (const byte *buf, size_t len)
 
 /**
  * cdk_keydb_export:
- * @hd: the keydb handle
+ * hd: the keydb handle
  * @out: the output stream
  * @remusr: the list of key pattern to export
- *
+ * 
  * Export a list of keys to the given output stream.
  * Use string list with names for pattering searching.
  * This procedure strips local signatures.
diff --git a/libextra/opencdk/opencdk.h b/libextra/opencdk/opencdk.h
index 7cd538db05..83ca487e91 100644
--- a/libextra/opencdk/opencdk.h
+++ b/libextra/opencdk/opencdk.h
@@ -23,12 +23,12 @@
 #include <gcrypt.h>
 
 /* The OpenCDK version as a string. */
-#define OPENCDK_VERSION "0.6.5"
+#define OPENCDK_VERSION "0.6.6"
 
 /* The OpenCDK version as integer components major.minor.path */
 #define OPENCDK_VERSION_MAJOR 0
 #define OPENCDK_VERSION_MINOR 6
-#define OPENCDK_VERSION_PATCH 5
+#define OPENCDK_VERSION_PATCH 6
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/libextra/opencdk/seskey.c b/libextra/opencdk/seskey.c
index a33e3450f5..268a648933 100644
--- a/libextra/opencdk/seskey.c
+++ b/libextra/opencdk/seskey.c
@@ -341,11 +341,11 @@ _cdk_sk_unprotect_auto (cdk_ctx_t hd, cdk_pkt_seckey_t sk)
 
 /**
  * cdk_dek_extract:
- * @ret_dek: the raw DEK object
- * @hd: the session handle
+ * ret_dek: the raw DEK object
+ * hd: the session handle
  * @enc: the public key encrypted packet
  * @sk: the secret key.
- *
+ * 
  * Try to extract the DEK from the public key encrypted packet. 
  **/
 cdk_error_t
diff --git a/libextra/opencdk/stream.c b/libextra/opencdk/stream.c
index 8aa3767623..d934ce690b 100644
--- a/libextra/opencdk/stream.c
+++ b/libextra/opencdk/stream.c
@@ -1015,8 +1015,9 @@ stream_flush (cdk_stream_t s)
 {
   assert (s);
   
-  if (fflush (s->fp))
-    return CDK_File_Error;
+  /* For some constellations it cannot be assured that the
+     return value is defined, thus we ignore it for now. */
+  (void)fflush (s->fp);
   return 0;
 }