[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_20-35-g4b04ad0

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=4b04ad0e3e01752599c85da5977b0dfcdcab405b

The branch, gnutls_3_0_x-2 has been updated
       via  4b04ad0e3e01752599c85da5977b0dfcdcab405b (commit)
       via  f4d832f2a25877b20386fe934a728ee3e9a21cf0 (commit)
      from  41b80b4c731b60cb104d45d137b6c5b99c82b640 (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 4b04ad0e3e01752599c85da5977b0dfcdcab405b
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Mon Jul 2 19:52:40 2012 +0200

    documented fix

commit f4d832f2a25877b20386fe934a728ee3e9a21cf0
Author: Nikos Mavrogiannopoulos <[email protected]>
Date:   Mon Jul 2 13:35:12 2012 +0200

    Handle EC DER keys.

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

Summary of changes:
 NEWS               |    4 ++++
 lib/x509/privkey.c |    7 ++++++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index b0f0469..df6a636 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ See the end for copying conditions.
 
 * Version 3.0.21 (unreleased)
 
+** libgnutls: fixed bug in gnutls_x509_privkey_import() 
+that prevented the loading of EC private keys when DER
+encoded. Reported by David Woodhouse.
+
 ** libgnutls: In DTLS larger to mtu records result to 
 GNUTLS_E_LARGE_PACKET instead of being truncated.
 
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index dc558b6..c2f2563 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -524,7 +524,12 @@ gnutls_x509_privkey_import (gnutls_x509_privkey_t key,
           key->pk_algorithm = GNUTLS_PK_DSA;
           key->key = decode_dsa_key (&_data, key);
           if (key->key == NULL)
-            gnutls_assert ();
+            {
+              key->pk_algorithm = GNUTLS_PK_EC;
+              key->key = _gnutls_privkey_decode_ecc_key (&_data, key);
+              if (key->key == NULL)
+                gnutls_assert ();
+            }
         }
     }
 


hooks/post-receive
-- 
GNU gnutls