[SCM] GNU gnutls branch, master, updated. gnutls_2_11_4-24-g4c96b27

[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=4c96b274661d185b5a6d8197d9ea401772ed87e7

The branch, master has been updated
       via  4c96b274661d185b5a6d8197d9ea401772ed87e7 (commit)
       via  42794c31945746e9934e539824960d7a830f9bb3 (commit)
      from  3557668d5ca189e472d5fbf86bde5ec45167d44e (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 4c96b274661d185b5a6d8197d9ea401772ed87e7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 16 15:41:47 2010 +0100

    Correctly write DSA public key in ASN.1 (add leading zero). Reported by 
Jeffrey Walton.

commit 42794c31945746e9934e539824960d7a830f9bb3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Nov 16 15:38:47 2010 +0100

    cleanups

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

Summary of changes:
 lib/x509/mpi.c           |    3 +--
 lib/x509/privkey_pkcs8.c |    2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 9673d0b..2ce6a53 100644
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -581,8 +581,7 @@ _gnutls_x509_write_dsa_public_key (bigint_t * params, int 
params_size,
       goto cleanup;
     }
 
-  asn1_delete_structure (&spk);
-  return 0;
+  result = 0;
 
 cleanup:
   asn1_delete_structure (&spk);
diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index fa33401..989c734 100644
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -178,7 +178,7 @@ _encode_privkey (gnutls_x509_privkey_t pkey, gnutls_datum_t 
* raw)
          return _gnutls_asn2err (ret);
        }
 
-      ret = _gnutls_x509_write_int (spk, "", pkey->params[4], 0);
+      ret = _gnutls_x509_write_int (spk, "", pkey->params[4], 1);
       if (ret < 0)
        {
          gnutls_assert ();


hooks/post-receive
-- 
GNU gnutls