summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-31 16:42:22 +0200
committerNikos Mavrogiannopoulos <nmav@redhat.com>2016-05-31 16:43:57 +0200
commit834649e6c635e48e37f0054d7815858c544902ee (patch)
tree61b55b83b071270dc2a912d277d16c53a1b569ea
parent86076c9b17b9a32b348cafb8b724f57f7da64d58 (diff)
downloadgnutls-834649e6c635e48e37f0054d7815858c544902ee.tar.gz
doc update [ci skip]
-rw-r--r--lib/x509/pkcs12_bag.c3
-rw-r--r--lib/x509/x509_ext.c8
2 files changed, 5 insertions, 6 deletions
diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 136db73755..3c41e55198 100644
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -91,7 +91,8 @@ void gnutls_pkcs12_bag_deinit(gnutls_pkcs12_bag_t bag)
*
* This function will return the bag's type.
*
- * Returns: One of the #gnutls_pkcs12_bag_type_t enumerations.
+ * Returns: On error a negative error value (when casted as integer) or
+ * one of the #gnutls_pkcs12_bag_type_t enumerations.
**/
gnutls_pkcs12_bag_type_t
gnutls_pkcs12_bag_get_type(gnutls_pkcs12_bag_t bag, int indx)
diff --git a/lib/x509/x509_ext.c b/lib/x509/x509_ext.c
index c22665cc0a..59c3b8e629 100644
--- a/lib/x509/x509_ext.c
+++ b/lib/x509/x509_ext.c
@@ -1486,9 +1486,8 @@ int gnutls_x509_ext_import_proxy(const gnutls_datum_t * ext, int *pathlen,
/**
* gnutls_x509_ext_export_proxy:
- * @pathLenConstraint: non-negative error codes indicate maximum length of path,
- * and negative error codes indicate that the pathLenConstraints field should
- * not be present.
+ * @pathLenConstraint: A negative value will remove the path length constraint,
+ * while non-negative values will be set as the length of the pathLenConstraints field.
* @policyLanguage: OID describing the language of @policy.
* @policy: uint8_t byte array with policy language, can be %NULL
* @sizeof_policy: size of @policy.
@@ -1496,8 +1495,7 @@ int gnutls_x509_ext_import_proxy(const gnutls_datum_t * ext, int *pathlen,
*
* This function will convert the parameters provided to a proxyCertInfo extension.
*
- * The @ext data will be allocated using
- * gnutls_malloc().
+ * The @ext data will be allocated using gnutls_malloc().
*
* Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
* negative error value.