diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-04-04 10:30:56 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2015-04-04 11:34:15 +0200 |
| commit | c2e05f97b6e32887f548d12e20291bde750d5390 (patch) | |
| tree | 26d98e7c67482bbda8a2b046302d119ba20876f6 /lib/pkcs11_write.c | |
| parent | 45050a7aa57ec07701c32fc3ff7d92202a5a8db3 (diff) | |
| download | gnutls-c2e05f97b6e32887f548d12e20291bde750d5390.tar.gz | |
doc updates
Diffstat (limited to 'lib/pkcs11_write.c')
| -rw-r--r-- | lib/pkcs11_write.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/lib/pkcs11_write.c b/lib/pkcs11_write.c index 3cce613d92..1cc4ac53ec 100644 --- a/lib/pkcs11_write.c +++ b/lib/pkcs11_write.c @@ -226,12 +226,15 @@ gnutls_pkcs11_copy_x509_crt2(const char *token_url, /** * gnutls_pkcs11_copy_attached_extension: * @token_url: A PKCS #11 URL specifying a token - * @obj: A pkcs11 object - * @label: A name to be used for the stored data + * @crt: An X.509 certificate object + * @data: the attached extension + * @label: A name to be used for the attached extension (may be %NULL) * @flags: One of GNUTLS_PKCS11_OBJ_FLAG_* * - * This function will copy an object into a PKCS #11 token specified by - * a URL. + * This function will copy an the attached extension in @data for + * the certificate provided in @crt in the PKCS #11 token specified + * by the URL (typically a trust module). The extension must be in + * RFC5280 Extension format. * * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a * negative error value. @@ -1040,6 +1043,7 @@ gnutls_pkcs11_token_get_random(const char *token_url, #if 0 /* For documentation purposes */ + /** * gnutls_pkcs11_copy_x509_crt: * @token_url: A PKCS #11 URL specifying a token @@ -1055,10 +1059,11 @@ gnutls_pkcs11_token_get_random(const char *token_url, * * Since: 2.12.0 **/ -gnutls_pkcs11_copy_x509_crt(const char *token_url, +int gnutls_pkcs11_copy_x509_crt(const char *token_url, gnutls_x509_crt_t crt, const char *label, unsigned int flags) { + int x; } /** @@ -1078,11 +1083,12 @@ gnutls_pkcs11_copy_x509_crt(const char *token_url, * * Since: 2.12.0 **/ -int -gnutls_pkcs11_copy_x509_privkey(const char *token_url, +int gnutls_pkcs11_copy_x509_privkey(const char *token_url, gnutls_x509_privkey_t key, const char *label, unsigned int key_usage, unsigned int flags) { + int x; } + #endif |