diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-05-13 17:51:30 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-05-13 17:51:30 +0200 |
| commit | a39c5f9fafd4b7bb4396b7a90c2cd66af3fa4290 (patch) | |
| tree | dc4ca1d42f37bffbe16851489bdd556d75d0469a /lib/includes/gnutls/openpgp.h | |
| parent | 1171b013f2947285860a4f2fc9b6c6a0e4f7444c (diff) | |
| download | gnutls-a39c5f9fafd4b7bb4396b7a90c2cd66af3fa4290.tar.gz | |
Doc fixes for GTK-DOC.
Diffstat (limited to 'lib/includes/gnutls/openpgp.h')
| -rw-r--r-- | lib/includes/gnutls/openpgp.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lib/includes/gnutls/openpgp.h b/lib/includes/gnutls/openpgp.h index 56373e278a..c75915e93b 100644 --- a/lib/includes/gnutls/openpgp.h +++ b/lib/includes/gnutls/openpgp.h @@ -69,7 +69,7 @@ extern "C" /* The key_usage flags are defined in gnutls.h. They are * the GNUTLS_KEY_* definitions. */ - int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t cert, + int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t key, unsigned int *key_usage); int gnutls_openpgp_crt_get_fingerprint (gnutls_openpgp_crt_t key, void *fpr, size_t * fprlen); @@ -153,7 +153,8 @@ extern "C" int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key, const gnutls_datum_t * data, gnutls_openpgp_crt_fmt_t format, - const char *pass, unsigned int flags); + const char *password, + unsigned int flags); int gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key, const gnutls_datum_t * hash, gnutls_datum_t * signature); @@ -287,6 +288,8 @@ extern "C" * fingerprint instead of a full key. See also * gnutls_openpgp_set_recv_key_function(). * + * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned, + * otherwise an error code is returned. */ typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t session, const unsigned char *keyfpr, @@ -309,24 +312,24 @@ extern "C" gnutls_certificate_set_openpgp_key_file (gnutls_certificate_credentials_t res, const char *certfile, const char *keyfile, - gnutls_openpgp_crt_fmt_t); + gnutls_openpgp_crt_fmt_t format); int gnutls_certificate_set_openpgp_key_mem (gnutls_certificate_credentials_t res, const gnutls_datum_t * cert, const gnutls_datum_t * key, - gnutls_openpgp_crt_fmt_t); + gnutls_openpgp_crt_fmt_t format); int gnutls_certificate_set_openpgp_key_file2 (gnutls_certificate_credentials_t res, const char *certfile, const char *keyfile, - const char *keyid, + const char *subkey_id, gnutls_openpgp_crt_fmt_t format); int gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t res, const gnutls_datum_t * cert, const gnutls_datum_t * key, - const char *keyid, + const char *subkey_id, gnutls_openpgp_crt_fmt_t format); int |