summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libextra/opencdk/kbnode.c4
-rw-r--r--libextra/opencdk/opencdk.h5
-rw-r--r--libextra/opencdk/stream.h4
3 files changed, 7 insertions, 6 deletions
diff --git a/libextra/opencdk/kbnode.c b/libextra/opencdk/kbnode.c
index a0f8dac317..b298715699 100644
--- a/libextra/opencdk/kbnode.c
+++ b/libextra/opencdk/kbnode.c
@@ -1,6 +1,6 @@
/* -*- Mode: C; c-file-style: "bsd" -*-
* kbnode.c - keyblock node utility functions
- * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 1999, 2000, 2001, 2006 Free Software Foundation, Inc.
* Copyright (C) 2002, 2003 Timo Schulz
*
* This file is part of OpenCDK.
@@ -438,7 +438,7 @@ cdk_kbnode_write_to_mem( cdk_kbnode_t node, byte * buf, size_t * r_nbytes )
if( !buf ) {
*r_nbytes = len; /* only return the length of the buffer */
cdk_stream_close( s );
- return 0;
+ return CDK_Too_Short;
}
if( *r_nbytes < len )
rc = CDK_Too_Short;
diff --git a/libextra/opencdk/opencdk.h b/libextra/opencdk/opencdk.h
index 6d49eaed37..e8161d185e 100644
--- a/libextra/opencdk/opencdk.h
+++ b/libextra/opencdk/opencdk.h
@@ -1,5 +1,6 @@
/* opencdk.h - Open Crypto Development Kit (OpenCDK)
- * Copyright (C) 2001, 2002, 2003 Timo Schulz
+ * Copyright (C) 2006 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005 Timo Schulz
*
* This file is part of OpenCDK.
*
@@ -23,7 +24,7 @@
#include <stdarg.h>
-#define OPENCDK_VERSION "0.5.5"
+#define OPENCDK_VERSION "0.5.9"
#ifdef __cplusplus
extern "C" {
diff --git a/libextra/opencdk/stream.h b/libextra/opencdk/stream.h
index 3d10891957..1a485f2b34 100644
--- a/libextra/opencdk/stream.h
+++ b/libextra/opencdk/stream.h
@@ -15,8 +15,8 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with OpenCDK; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * along with OpenCDK; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef CDK_STREAM_H