[SCM] GNU gnutls branch, master, updated. gnutls_3_1_4-51-g28b4658

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=28b4658aa523ed7abae9b3e0958515c341b1c648

The branch, master has been updated
       via  28b4658aa523ed7abae9b3e0958515c341b1c648 (commit)
       via  474d1b6c6b4a6510d1e39d0373514bfd04201d16 (commit)
      from  074d9d03bac65c7ac5f0bd76b76bf5a6ef10a619 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 28b4658aa523ed7abae9b3e0958515c341b1c648
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Nov 21 09:17:43 2012 +0100

    doc update

commit 474d1b6c6b4a6510d1e39d0373514bfd04201d16
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Wed Nov 21 08:23:10 2012 +0100

    doc update

-----------------------------------------------------------------------

Summary of changes:
 doc/cha-cert-auth.texi  |   13 +++++++------
 doc/cha-cert-auth2.texi |    2 +-
 lib/pkcs11_privkey.c    |    2 +-
 lib/x509/output.c       |    2 ++
 lib/x509/x509.c         |   34 ++++++++++++++++++++++------------
 lib/x509/x509_write.c   |    2 ++
 6 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/doc/cha-cert-auth.texi b/doc/cha-cert-auth.texi
index 6b9c85d..a665ef7 100644
--- a/doc/cha-cert-auth.texi
+++ b/doc/cha-cert-auth.texi
@@ -229,17 +229,18 @@ can be accessed using 
@funcref{gnutls_x509_crt_get_dn_by_oid}.
 @showfuncdesc{gnutls_x509_crt_get_dn_by_oid}
 @showfuncdesc{gnutls_x509_crt_get_dn_oid}
 
+Similar functions exist to access the distinguished name
+of the issuer of the certificate.
+
address@hidden,gnutls_x509_crt_get_issuer_dn_by_oid,gnutls_x509_crt_get_issuer_dn_oid,gnutls_x509_crt_get_issuer}
+
 The more powerful @funcref{gnutls_x509_crt_get_subject} and 
address@hidden provide efficient access
address@hidden provide efficient but low-level access
 to the contents of the distinguished name structure.
 
address@hidden
address@hidden,gnutls_x509_crt_get_issuer}
 @showfuncdesc{gnutls_x509_dn_get_rdn_ava}
 
-Similar functions exist to access the distinguished name
-of the issuer of the certificate.
-
address@hidden,gnutls_x509_crt_get_issuer_dn_by_oid,gnutls_x509_crt_get_issuer_dn_oid,gnutls_x509_crt_get_issuer}
 
 @node X.509 public and private keys
 @subsection Accessing public and private keys
diff --git a/doc/cha-cert-auth2.texi b/doc/cha-cert-auth2.texi
index a463d6d..975a064 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 a4ace84..615b81f 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 09f6150..b3657d7 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 7c65e7d..bbe5a62 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, 
@@ -2367,12 +2370,12 @@ get_dn (gnutls_x509_crt_t cert, const char *whom, 
gnutls_x509_dn_t * dn)
  * @cert: should contain a #gnutls_x509_crt_t structure
  * @dn: output variable with pointer to uint8_t DN.
  *
- * Return the Certificate's Subject DN as an uint8_t data type.  You
- * may use gnutls_x509_dn_get_rdn_ava() to decode the DN. 
+ * Return the Certificate's Subject DN as a %gnutls_x509_dn_t data type,
+ * that can be decoded using gnutls_x509_dn_get_rdn_ava(). 
  *
- * Note that @dn should be treated as constant. Because points 
- * into the @cert object, you may not deallocate @cert 
- * and continue to access @dn.
+ * Note that @dn should be treated as constant. Because it points 
+ * into the @cert object, you should not use @dn after @cert is
+ * deallocated.
  *
  * Returns: Returns 0 on success, or an error code.
  **/
@@ -2387,12 +2390,12 @@ gnutls_x509_crt_get_subject (gnutls_x509_crt_t cert, 
gnutls_x509_dn_t * dn)
  * @cert: should contain a #gnutls_x509_crt_t structure
  * @dn: output variable with pointer to uint8_t DN
  *
- * Return the Certificate's Issuer DN as an uint8_t data type.  You may
- * use gnutls_x509_dn_get_rdn_ava() to decode the DN.
+ * Return the Certificate's Issuer DN as a %gnutls_x509_dn_t data type,
+ * that can be decoded using gnutls_x509_dn_get_rdn_ava(). 
  *
- * Note that @dn should be treated as constant. Because points 
- * into the @cert object, you may not deallocate @cert 
- * and continue to access @dn.
+ * Note that @dn should be treated as constant. Because it points 
+ * into the @cert object, you should not use @dn after @cert is
+ * deallocated.
  *
  * Returns: Returns 0 on success, or an error code.
  **/
@@ -2404,12 +2407,19 @@ gnutls_x509_crt_get_issuer (gnutls_x509_crt_t cert, 
gnutls_x509_dn_t * dn)
 
 /**
  * gnutls_x509_dn_get_rdn_ava:
- * @dn: input variable with uint8_t DN pointer
+ * @dn: a pointer to DN
  * @irdn: index of RDN
  * @iava: index of AVA.
  * @ava: Pointer to structure which will hold output information.
  *
- * Get pointers to data within the DN.
+ * Get pointers to data within the DN. The format of the @ava structure
+ * is shown below.
+ *
+ *  struct gnutls_x509_ava_st {
+ *    gnutls_datum_t oid;
+ *    gnutls_datum_t value;
+ *    unsigned long value_tag;
+ *  };
  *
  * Note that @ava will contain pointers into the @dn structure, so you
  * should not modify any data or deallocate it.  Note also that the DN
diff --git a/lib/x509/x509_write.c b/lib/x509/x509_write.c
index 49a28f2..a8bf474 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,


hooks/post-receive
-- 
GNU gnutls