summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2011-03-16 18:37:45 +0100
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2011-03-16 20:52:42 +0100
commit60338e8676f85dc6f26427b053f9c549d3bc1431 (patch)
treefa39d33c2490be0bb5c39297e4465dc5e8e27194 /lib
parenta32853d3da525ceb4211e869b6dfa4e5a469e7c8 (diff)
downloadgnutls-60338e8676f85dc6f26427b053f9c549d3bc1431.tar.gz
Documentation fixed. Added fresh keys to test.
Diffstat (limited to 'lib')
-rw-r--r--lib/openpgp/gnutls_openpgp.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/openpgp/gnutls_openpgp.c b/lib/openpgp/gnutls_openpgp.c
index 5d14668706..bc7cb1c863 100644
--- a/lib/openpgp/gnutls_openpgp.c
+++ b/lib/openpgp/gnutls_openpgp.c
@@ -277,7 +277,7 @@ leave:
* @format: the format of the keys
*
* This funtion is used to load OpenPGP keys into the GnuTLS credential
- * structure. The files should contain non encrypted keys.
+ * structure. The datum should contain at least one valid non encrypted subkey.
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
@@ -300,8 +300,7 @@ gnutls_certificate_set_openpgp_key_mem (gnutls_certificate_credentials_t res,
* @format: the format of the keys
*
* This funtion is used to load OpenPGP keys into the GnuTLS
- * credentials structure. The files should only contain one key which
- * is not encrypted.
+ * credentials structure. The file should contain at least one valid non encrypted subkey.
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
@@ -346,8 +345,7 @@ get_keyid (gnutls_openpgp_keyid_t keyid, const char *str)
* @format: the format of the keys
*
* This funtion is used to load OpenPGP keys into the GnuTLS
- * credentials structure. The files should only contain one key which
- * is not encrypted.
+ * credentials structure. The datum should contain at least one valid non encrypted subkey.
*
* The special keyword "auto" is also accepted as @subkey_id. In that
* case the gnutls_openpgp_crt_get_auth_subkey() will be used to
@@ -444,7 +442,7 @@ gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t res,
* @format: the format of the keys
*
* This funtion is used to load OpenPGP keys into the GnuTLS credential
- * structure. The files should contain non encrypted keys.
+ * structure. The file should contain at least one valid non encrypted subkey.
*
* The special keyword "auto" is also accepted as @subkey_id. In that
* case the gnutls_openpgp_crt_get_auth_subkey() will be used to