[SCM] GNU gnutls branch, master, updated. gnutls_3_1_4-20-gf8a0214

[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=f8a0214756de685fe7c7cae31be9335531812d6a

The branch, master has been updated
       via  f8a0214756de685fe7c7cae31be9335531812d6a (commit)
       via  39957e6a7fc09c97d230a25c76d089a151391bdf (commit)
       via  c96034485d1d1edc6f012eb276e26e072c9bc087 (commit)
      from  3ff3ab8abe12d6b76cab2b42b1ccff94d5e54854 (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 f8a0214756de685fe7c7cae31be9335531812d6a
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 16 21:25:53 2012 +0100

    updated doc

commit 39957e6a7fc09c97d230a25c76d089a151391bdf
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 16 21:21:48 2012 +0100

    documented update

commit c96034485d1d1edc6f012eb276e26e072c9bc087
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 16 00:00:11 2012 +0100

    updated

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

Summary of changes:
 NEWS              |    6 ++++++
 lib/gnutls_cert.c |   20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 382bfa0..5dcec4d 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,12 @@ key.
 ** Added PKCS #11 key generation function that returns the public key
 on generation.
 
+** Corrected bug in priority string parsing, that mostly affected combined
+levels. Patch by Tim Kosse.
+
+** p11tool: After key generation, outputs the public key (useful in
+tokens that do not store the public key).
+
 ** API and ABI modifications:
 gnutls_pkcs11_privkey_generate2: Added
 
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 2510f00..c451ef5 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -641,11 +641,11 @@ _gnutls_openpgp_crt_verify_peers (gnutls_session_t 
session,
  * @session: is a gnutls session
  * @status: is the output of the verification
  *
- * This function will verify the peer's certificate and return
- * its status (trusted, invalid etc.).  The value of @status will
- * be one or more of the gnutls_certificate_status_t flags
- * bitwise or'd or zero if the certificate is trusted. Note that verification 
- * failure does not imply a negative return value. Only the @status is updated.
+ * This function will verify the peer's certificate and store
+ * the status in the @status variable as a bitwise or'd 
gnutls_certificate_status_t
+ * values or zero if the certificate is trusted. Note that value in @status
+ * is set only when the return value of this function is success (i.e, failure 
+ * to trust a certificate does not imply a negative return value).
  *
  * If available the OCSP Certificate Status extension will be
  * utilized by this function.
@@ -696,11 +696,11 @@ gnutls_certificate_verify_peers2 (gnutls_session_t 
session,
  * @hostname: is the expected name of the peer; may be %NULL
  * @status: is the output of the verification
  *
- * This function will verify the peer's certificate and its name and 
- * return its status (trusted, invalid etc.).  The value of @status will
- * be one or more of the gnutls_certificate_status_t flags
- * bitwise or'd or zero if the certificate is trusted. Note that verification 
- * failure does not imply a negative return value. Only the @status is updated.
+ * This function will verify the peer's certificate and store the
+ * status in the @status variable as a bitwise or'd gnutls_certificate_status_t
+ * values or zero if the certificate is trusted. Note that value in @status
+ * is set only when the return value of this function is success (i.e, failure 
+ * to trust a certificate does not imply a negative return value).
  *
  * If the @hostname provided is non-NULL then this function will compare
  * the hostname in the certificate against the given. If they do not match 


hooks/post-receive
-- 
GNU gnutls