diff options
| author | Simon Josefsson <simon@josefsson.org> | 2006-10-26 14:15:41 +0000 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2006-10-26 14:15:41 +0000 |
| commit | e6275b029c673998dd47d8588ef876e56ef53222 (patch) | |
| tree | e49417a6d9f157f0a8dece4069369ebb60526762 | |
| parent | 84e60c0ee8e9987129c27c2e703f8edfc87d7ade (diff) | |
| download | gnutls-e6275b029c673998dd47d8588ef876e56ef53222.tar.gz | |
Update to 0.5.11.
| -rw-r--r-- | libextra/opencdk/encrypt.c | 3 | ||||
| -rw-r--r-- | libextra/opencdk/opencdk.h | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/libextra/opencdk/encrypt.c b/libextra/opencdk/encrypt.c index 5fe69dbf42..2ad7c294f6 100644 --- a/libextra/opencdk/encrypt.c +++ b/libextra/opencdk/encrypt.c @@ -1,5 +1,6 @@ /* -*- Mode: C; c-file-style: "bsd" -*- * encrypt.c + * Copyright (C) 2006 Free Software Foundation, Inc. * Copyright (C) 2002, 2003 Timo Schulz * * This file is part of OpenCDK. @@ -992,7 +993,7 @@ cdk_data_transform( cdk_ctx_t hd, enum cdk_crypto_mode_t mode, rc = cdk_keydb_import( db, knode, res ); if( !rc ) { *outbuf = NULL; /* FIXME */ - *outsize = strlen( *outbuf ); + *outsize = 0; } cdk_kbnode_release( knode ); } diff --git a/libextra/opencdk/opencdk.h b/libextra/opencdk/opencdk.h index 273dc945e6..fc82d20ef0 100644 --- a/libextra/opencdk/opencdk.h +++ b/libextra/opencdk/opencdk.h @@ -24,7 +24,7 @@ #include <stdarg.h> -#define OPENCDK_VERSION "0.5.10" +#define OPENCDK_VERSION "0.5.11" #ifdef __cplusplus extern "C" { @@ -772,6 +772,8 @@ cdk_error_t cdk_sklist_write_onepass( cdk_keylist_t skl, cdk_stream_t outp, /*-- encrypt.c --*/ cdk_error_t cdk_stream_encrypt (cdk_ctx_t hd, cdk_strlist_t remusr, cdk_stream_t inp, cdk_stream_t out); +cdk_error_t cdk_stream_decrypt (cdk_ctx_t hd, cdk_stream_t inp, + cdk_stream_t out); cdk_error_t cdk_file_encrypt (cdk_ctx_t hd, cdk_strlist_t remusr, const char * file, const char * output); cdk_error_t cdk_file_decrypt (cdk_ctx_t hd, const char * file, |