diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-11-21 08:23:10 +0100 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-11-21 08:25:19 +0100 |
commit | 474d1b6c6b4a6510d1e39d0373514bfd04201d16 (patch) | |
tree | 12861a96371d27ec13f45d9c917711dc3dd82bd7 | |
parent | 074d9d03bac65c7ac5f0bd76b76bf5a6ef10a619 (diff) | |
download | gnutls-474d1b6c6b4a6510d1e39d0373514bfd04201d16.tar.gz |
doc update
-rw-r--r-- | doc/cha-cert-auth2.texi | 2 | ||||
-rw-r--r-- | lib/pkcs11_privkey.c | 2 | ||||
-rw-r--r-- | lib/x509/output.c | 2 | ||||
-rw-r--r-- | lib/x509/x509.c | 3 | ||||
-rw-r--r-- | lib/x509/x509_write.c | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi index a463d6d098..975a06469b 100644 --- a/doc/cha-cert-auth2.texi +++ b/doc/cha-cert-auth2.texi @@ -322,7 +322,7 @@ well as a trusted CA certificate. @subheading High level functionality Generic and higher level private key import functions are available, that -will auto-detect the encrypted key format. +import plain or encrypted keys and will auto-detect the encrypted key format. @showfuncdesc{gnutls_x509_privkey_import2} diff --git a/lib/pkcs11_privkey.c b/lib/pkcs11_privkey.c index a4ace845ca..615b81ffea 100644 --- a/lib/pkcs11_privkey.c +++ b/lib/pkcs11_privkey.c @@ -567,7 +567,7 @@ gnutls_pkcs11_privkey_generate (const char* url, gnutls_pk_algorithm_t pk, * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a * negative error value. * - * Since: 3.1 + * Since: 3.1.5 **/ int gnutls_pkcs11_privkey_generate2 (const char* url, gnutls_pk_algorithm_t pk, diff --git a/lib/x509/output.c b/lib/x509/output.c index 09f61500de..b3657d7e19 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -2549,6 +2549,8 @@ print_pubkey_other (gnutls_buffer_st * str, gnutls_pubkey_t pubkey, gnutls_certi * * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a * negative error value. + * + * Since: 3.1.5 **/ int gnutls_pubkey_print (gnutls_pubkey_t pubkey, diff --git a/lib/x509/x509.c b/lib/x509/x509.c index 7c65e7d656..d3cd2a80bd 100644 --- a/lib/x509/x509.c +++ b/lib/x509/x509.c @@ -1766,6 +1766,7 @@ gnutls_x509_crt_get_proxy (gnutls_x509_crt_t cert, * This function will deinitialize all memory associated with the provided * @policy. The policy is allocated using gnutls_x509_crt_get_policy(). * + * Since: 3.1.5 **/ void gnutls_x509_policy_release(struct gnutls_x509_policy_st* policy) { @@ -1871,6 +1872,8 @@ cleanup: * * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, %GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE * if the extension is not present, otherwise a negative error value. + * + * Since: 3.1.5 **/ int gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int indx, diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c index 49a28f23db..a8bf4749d2 100644 --- a/lib/x509/x509_write.c +++ b/lib/x509/x509_write.c @@ -1618,6 +1618,8 @@ error: * * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a * negative error value. + * + * Since: 3.1.5 **/ int gnutls_x509_crt_set_policy (gnutls_x509_crt_t crt, struct gnutls_x509_policy_st* policy, |