[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_19-44-g0cd87aa

[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=0cd87aa365ea26a3f4eb6a2500529f5e8343f5f4

The branch, gnutls_3_0_x-2 has been updated
       via  0cd87aa365ea26a3f4eb6a2500529f5e8343f5f4 (commit)
       via  e476ef069f50de1987b7307e97259e9ddf0c39b5 (commit)
       via  a6dd56c0374bcf2367520f7050f70034919bb605 (commit)
       via  73f675125728dd54d32ea533019f276823a3674b (commit)
       via  0624ff59998c180acfa127ccc3bb402e67bf52dc (commit)
       via  433181cb01b46d08619a42819f48ed8b82bb6f23 (commit)
       via  7b20e72332e3e5238e8236375a2a82b1387e2e06 (commit)
      from  6299e8a8c7371da1e674419c36cbcbe1630aef0a (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 0cd87aa365ea26a3f4eb6a2500529f5e8343f5f4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 2 00:51:48 2012 +0200

    updated

commit e476ef069f50de1987b7307e97259e9ddf0c39b5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Jun 2 00:51:42 2012 +0200

    doc updates

commit a6dd56c0374bcf2367520f7050f70034919bb605
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 31 22:25:40 2012 +0200

    corrected text

commit 73f675125728dd54d32ea533019f276823a3674b
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 31 22:22:41 2012 +0200

    corrected typo

commit 0624ff59998c180acfa127ccc3bb402e67bf52dc
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 31 09:40:56 2012 +0200

    typo fix

commit 433181cb01b46d08619a42819f48ed8b82bb6f23
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 31 09:16:25 2012 +0200

    documented behavior.

commit 7b20e72332e3e5238e8236375a2a82b1387e2e06
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Thu May 31 09:16:16 2012 +0200

    Do not crash if password is null and GNUTLS_PKCS_PLAIN is not specified.

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

Summary of changes:
 NEWS                            |    6 ++++++
 lib/gnutls_ui.c                 |    2 +-
 lib/includes/gnutls/gnutls.h.in |    3 +--
 lib/x509/privkey.c              |    5 +++--
 lib/x509/privkey_pkcs8.c        |    2 +-
 lib/x509/verify.c               |    2 +-
 lib/x509/x509.c                 |    4 ++--
 7 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 5ce7d5d..8e50841 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ See the end for copying conditions.
 
 * Version 3.0.20 (unreleased)
 
+** libgnutls: Corrected bug which prevented the parsing of
+handshake packets spanning multiple records.
+
 ** libgnutls: Check key identifiers when checking for an issuer.
 
 ** libgnutls: Added gnutls_pubkey_verify_hash2()
@@ -18,6 +21,9 @@ name type in certtool.
 ** certtool: Increase to 128 the number of distinct options
 (e.g. dns_names) allowed.
 
+** gnutls-cli: If --print-cert is given, print the certificate, 
+even on verification failure.
+
 ** API and ABI modifications:
 gnutls_pk_to_sign: Added
 gnutls_pubkey_verify_hash2: Added
diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 4a44dc6..ac822a5 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -493,7 +493,7 @@ gnutls_dh_get_peers_public_bits (gnutls_session_t session)
  * list is being returned. Only the first certificate.
  *
  * Returns: a pointer to a #gnutls_datum_t containing our
- *   certificates, or %NULL in case of an error or if no certificate
+ *   certificate, or %NULL in case of an error or if no certificate
  *   was used.
  **/
 const gnutls_datum_t *
diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index ed4d794..95ce1c7 100644
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -429,8 +429,7 @@ extern "C"
  * @GNUTLS_CERT_REVOKED: Certificate is revoked by its authority.  In X.509 
this will be
  *   set only if CRLs are checked.
  * @GNUTLS_CERT_SIGNER_NOT_FOUND: The certificate's issuer is not known. 
- *   This is the case if the issue is not included in the trusted certificate 
list.
- *   not found.
+ *   This is the case if the issuer is not included in the trusted certificate 
list.
  * @GNUTLS_CERT_SIGNER_NOT_CA: The certificate’s signer was not a CA. This
  *   may happen if this was a version 1 certificate, which is common with 
  *   some CAs, or a version 3 certificate without the basic constrains 
extension.
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 4d622cc..dc558b6 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -421,8 +421,9 @@ error:
  * native #gnutls_x509_privkey_t format. The output will be stored in
  * @key .
  *
- * If the key is PEM encoded it should have a header of "RSA PRIVATE
- * KEY", or "DSA PRIVATE KEY".
+ * If the key is PEM encoded it should have a header that contains "PRIVATE
+ * KEY". Note that this function falls back to PKCS #8 decoding without
+ * password, if the default format fails to import.
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index dc0be38..b442956 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -1228,7 +1228,7 @@ gnutls_x509_privkey_import_pkcs8 (gnutls_x509_privkey_t 
key,
       need_free = 1;
     }
 
-  if (flags & GNUTLS_PKCS_PLAIN)
+  if (password == NULL || (flags & GNUTLS_PKCS_PLAIN))
     {
       result = decode_private_key_info (&_data, key);
     }
diff --git a/lib/x509/verify.c b/lib/x509/verify.c
index 0133e88..bcca386 100644
--- a/lib/x509/verify.c
+++ b/lib/x509/verify.c
@@ -245,7 +245,7 @@ is_issuer (gnutls_x509_crt_t cert, gnutls_x509_crt_t 
issuer_cert)
   if (ret != 0)
     {
       /* check if the authority key identifier matches the subject key 
identifier
-       * of the isser */
+       * of the issuer */
        id1_size = sizeof(id1);
        
        ret = gnutls_x509_crt_get_authority_key_id(cert, id1, &id1_size, NULL);
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 643f316..4b533eb 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -2059,7 +2059,7 @@ cleanup:
  * @start: will hold the starting point of the DN
  *
  * This function will return a pointer to the DER encoded DN structure
- * and the length.
+ * and the length. This points to allocated data that must be free'd using 
gnutls_free().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value.or a negative error code on error.
@@ -2078,7 +2078,7 @@ gnutls_x509_crt_get_raw_issuer_dn (gnutls_x509_crt_t cert,
  * @start: will hold the starting point of the DN
  *
  * This function will return a pointer to the DER encoded DN structure and
- * the length.
+ * the length. This points to allocated data that must be free'd using 
gnutls_free().
  *
  * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
  *   negative error value. or a negative error code on error.


hooks/post-receive
-- 
GNU gnutls