*** empty log message ***

5 files changed, 39 insertions, 38 deletions

diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index 308cf65ee4..041350aafd 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -159,8 +159,8 @@ int gnutls_x509_crl_import(gnutls_x509_crl crl, const gnutls_datum * data,
   * If buf is null then only the size will be filled.
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
-  * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * in that case the sizeof_buf will be updated with the required size, and
+  * 0 on success.
   *
   **/
 int gnutls_x509_crl_get_issuer_dn(gnutls_x509_crl crl, char *buf,
@@ -192,8 +192,8 @@ int gnutls_x509_crl_get_issuer_dn(gnutls_x509_crl crl, char *buf,
   * If buf is null then only the size will be filled.
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
-  * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * in that case the sizeof_buf will be updated with the required size,
+  * and 0 on success.
   *
   **/
 int gnutls_x509_crl_get_issuer_dn_by_oid(gnutls_x509_crl crl,
@@ -502,8 +502,7 @@ cleanup:
   * If the structure is PEM encoded, it will have a header
   * of "BEGIN X509 CRL".
   *
-  * In case of failure a negative value will be returned, and
-  * 0 on success.
+  * Returns 0 on success, and a negative value on failure.
   *
   **/
 int gnutls_x509_crl_export( gnutls_x509_crl crl,
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index ac04d1c4da..a0710863c1 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -170,7 +170,7 @@ int gnutls_x509_crq_import(gnutls_x509_crq crq, const gnutls_datum * data,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crq_get_dn(gnutls_x509_crq crq, char *buf,
@@ -202,7 +202,7 @@ int gnutls_x509_crq_get_dn(gnutls_x509_crq crq, char *buf,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crq_get_dn_by_oid(gnutls_x509_crq crq, const char* oid, 
@@ -365,7 +365,7 @@ static int parse_attribute(ASN1_TYPE asn1_struct,
   * This function will return the challenge password in the
   * request.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_get_challenge_password(gnutls_x509_crq crq, 
@@ -393,7 +393,7 @@ int gnutls_x509_crq_get_challenge_password(gnutls_x509_crq crq,
   * Some helper macros with popular OIDs can be found in gnutls/x509.h
   * With this function you can only set the known OIDs.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq crq, const char* oid, 
@@ -415,7 +415,7 @@ int gnutls_x509_crq_set_dn_by_oid(gnutls_x509_crq crq, const char* oid,
   * This function will set the version of the certificate request. This
   * must be zero.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_set_version(gnutls_x509_crq crq, unsigned int version)
@@ -445,7 +445,7 @@ uint8 null = version;
   * This function will set the public parameters from the given private key to the
   * request. Only RSA keys are currently supported.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_set_key(gnutls_x509_crq crq, gnutls_x509_privkey key)
@@ -476,7 +476,7 @@ int result;
   *
   * This function will set a challenge password to be used when revoking the request.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_set_challenge_password(gnutls_x509_crq crq, const char* pass)
@@ -519,7 +519,7 @@ int result;
   * This must be the last step in a certificate request generation since all
   * the previously set parameters are now signed.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crq_sign(gnutls_x509_crq crq, gnutls_x509_privkey key)
diff --git a/lib/x509/pkcs12_bag.c b/lib/x509/pkcs12_bag.c
index 39bde9b105..e0338cba2c 100644
--- a/lib/x509/pkcs12_bag.c
+++ b/lib/x509/pkcs12_bag.c
@@ -288,7 +288,9 @@ int _pkcs12_encode_crt_bag( gnutls_pkcs12_bag_type type, const gnutls_datum* raw
   * @data: the data to be copied.
   *
   * This function will insert the given data of the given type into the
-  * bag. On success returns the index of the added bag, or a negative
+  * bag. 
+  *
+  * Returns the index of the added bag on success, or a negative
   * value on error.
   *
   **/
@@ -342,8 +344,8 @@ int ret;
   * This function will insert the given certificate into the
   * bag. This is just a wrapper over gnutls_pkcs12_bag_set_data().
   *
-  * On success returns the index of the added bag, or a negative
-  * value on error.
+  * Returns the index of the added bag on success, or a negative
+  * value on failure.
   *
   **/
 int gnutls_pkcs12_bag_set_crt(gnutls_pkcs12_bag bag, gnutls_x509_crt crt)
@@ -377,8 +379,8 @@ gnutls_datum data;
   * This function will insert the given CRL into the
   * bag. This is just a wrapper over gnutls_pkcs12_bag_set_data().
   *
-  * On success returns the index of the added bag, or a negative
-  * value on error.
+  * Returns the index of the added bag on success, or a negative
+  * value on failure.
   *
   **/
 int gnutls_pkcs12_bag_set_crl(gnutls_pkcs12_bag bag, gnutls_x509_crl crl)
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 5ed50f5d09..11802ed777 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -222,7 +222,7 @@ int gnutls_x509_crt_import(gnutls_x509_crt cert, const gnutls_datum * data,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt cert, char *buf,
@@ -254,7 +254,7 @@ int gnutls_x509_crt_get_issuer_dn(gnutls_x509_crt cert, char *buf,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
@@ -282,7 +282,7 @@ int gnutls_x509_crt_get_issuer_dn_by_oid(gnutls_x509_crt cert, const char* oid,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crt_get_dn(gnutls_x509_crt cert, char *buf,
@@ -314,7 +314,7 @@ int gnutls_x509_crt_get_dn(gnutls_x509_crt cert, char *buf,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crt_get_dn_by_oid(gnutls_x509_crt cert, const char* oid, 
@@ -447,7 +447,7 @@ time_t gnutls_x509_crt_get_expiration_time(gnutls_x509_crt cert)
   * large serial numbers, thus it may be wise to handle it as something
   * opaque. 
   *
-  * Returns a negative value in case of an error, and 0 on success.
+  * Returns 0 on success and a negative value in case of an error.
   *
   **/
 int gnutls_x509_crt_get_serial(gnutls_x509_crt cert, char* result, 
@@ -854,7 +854,7 @@ cleanup:
   * This function will return a pointer to the DER encoded DN structure and
   * the length.
   *
-  * Returns a negative value on error, and zero on success.
+  * Returns 0 on success or a negative value on error.
   *
   -*/
 int _gnutls_x509_crt_get_raw_issuer_dn( gnutls_x509_crt cert,
@@ -871,7 +871,7 @@ int _gnutls_x509_crt_get_raw_issuer_dn( gnutls_x509_crt cert,
   * This function will return a pointer to the DER encoded DN structure and
   * the length.
   *
-  * Returns a negative value on error, and zero on success.
+  * Returns 0 on success, or a negative value on error.
   *
   -*/
 int _gnutls_x509_crt_get_raw_dn( gnutls_x509_crt cert,
@@ -895,7 +895,7 @@ int _gnutls_x509_crt_get_raw_dn( gnutls_x509_crt cert,
   *
   * Returns GNUTLS_E_SHORT_MEMORY_BUFFER if the provided buffer is not long enough, and
   * in that case the sizeof_buf will be updated with the required size.
-  * On success zero is returned.
+  * On success 0 is returned.
   *
   **/
 int gnutls_x509_crt_get_fingerprint(gnutls_x509_crt cert, 
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 4f270ea3e7..64cc5af304 100644
--- a/lib/x509/x509_write.c
+++ b/lib/x509/x509_write.c
@@ -55,7 +55,7 @@ static void disable_optional_stuff( gnutls_x509_crt cert);
   * Some helper macros with popular OIDs can be found in gnutls/x509.h
   * With this function you can only set the known OIDs.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_dn_by_oid(gnutls_x509_crt crt, const char* oid, 
@@ -82,7 +82,7 @@ int gnutls_x509_crt_set_dn_by_oid(gnutls_x509_crt crt, const char* oid,
   * Some helper macros with popular OIDs can be found in gnutls/x509.h
   * With this function you can only set the known OIDs.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_issuer_dn_by_oid(gnutls_x509_crt crt, const char* oid, 
@@ -104,7 +104,7 @@ int gnutls_x509_crt_set_issuer_dn_by_oid(gnutls_x509_crt crt, const char* oid,
   * This function will set the version of the certificate request. This
   * must be zero.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_version(gnutls_x509_crt crt, unsigned int version)
@@ -129,7 +129,7 @@ uint8 null = version;
   * This function will set the public parameters from the given private key to the
   * certificate. Only RSA keys are currently supported.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_key(gnutls_x509_crt crt, gnutls_x509_privkey key)
@@ -156,7 +156,7 @@ int result;
   * This function will set the name and public parameters from the given certificate request to the
   * certificate. Only RSA keys are currently supported.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_crq(gnutls_x509_crt crt, gnutls_x509_crq crq)
@@ -196,7 +196,7 @@ int pk_algorithm;
   *
   * This function will set the basicConstraints certificate extension. 
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_ca_status(gnutls_x509_crt crt, unsigned int ca)
@@ -234,7 +234,7 @@ gnutls_datum der_data;
   *
   * This function will set the subject alternative name certificate extension. 
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_set_subject_alternative_name(gnutls_x509_crt crt, gnutls_x509_subject_alt_name type,
@@ -289,7 +289,7 @@ unsigned int critical;
   * This must be the last step in a certificate generation since all
   * the previously set parameters are now signed.
   *
-  * On success zero is returned.
+  * Returns 0 on success.
   *
   **/
 int gnutls_x509_crt_sign(gnutls_x509_crt crt, gnutls_x509_crt issuer, 
@@ -400,7 +400,7 @@ const char* pk;
   *
   * This function will set the time this Certificate was or will be activated.
   *
-  * Returns a negative value in case of an error, and 0 on success.
+  * Returns 0 on success, or a negative value in case of an error.
   *
   **/
 int gnutls_x509_crt_set_activation_time(gnutls_x509_crt cert, time_t act_time)
@@ -415,7 +415,7 @@ int gnutls_x509_crt_set_activation_time(gnutls_x509_crt cert, time_t act_time)
   *
   * This function will set the time this Certificate will expire.
   *
-  * Returns a negative value in case of an error, and 0 on success.
+  * Returns 0 on success, or a negative value in case of an error.
   *
   **/
 int gnutls_x509_crt_set_expiration_time(gnutls_x509_crt cert, time_t exp_time)
@@ -434,7 +434,7 @@ int gnutls_x509_crt_set_expiration_time(gnutls_x509_crt cert, time_t exp_time)
   * large serial numbers, thus it may be wise to handle it as something
   * opaque. 
   *
-  * Returns a negative value in case of an error, and 0 on success.
+  * Returns 0 on success, or a negative value in case of an error.
   *
   **/
 int gnutls_x509_crt_set_serial(gnutls_x509_crt cert, const unsigned char* serial,