summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2007-11-16 17:25:52 +0100
committerSimon Josefsson <simon@josefsson.org>2007-11-16 17:25:52 +0100
commit7ea9f78236693f91eb25578ed703ce24aa50a3c7 (patch)
treecdb662572ef46b6f1a85f490f1dd25f41a84de4a
parent9fd75224d6965524b1563ff9603384a11a7a6953 (diff)
downloadgnutls-7ea9f78236693f91eb25578ed703ce24aa50a3c7.tar.gz
Re-apply opencdk fixes that were lost in 0.6.6 upgrade.
-rw-r--r--libextra/opencdk/keydb.c4
-rw-r--r--libextra/opencdk/seskey.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/libextra/opencdk/keydb.c b/libextra/opencdk/keydb.c
index acebd56fff..8b04d3f6ac 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/seskey.c b/libextra/opencdk/seskey.c
index 268a648933..0f5d0f90c0 100644
--- a/libextra/opencdk/seskey.c
+++ b/libextra/opencdk/seskey.c
@@ -341,8 +341,8 @@ _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.
*