[SCM] GNU gnutls branch, gnutls_3_0_x-2, updated. gnutls_3_0_23-20-g813dbf2

[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=813dbf2f590ee2353237eb82b2822eac6bb886e4

The branch, gnutls_3_0_x-2 has been updated
       via  813dbf2f590ee2353237eb82b2822eac6bb886e4 (commit)
      from  804f01c627215d39d44694ecdcb2280558c72055 (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 813dbf2f590ee2353237eb82b2822eac6bb886e4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Sep 16 21:41:50 2012 +0200

    avoid duplicate asn1 structure initialization.

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

Summary of changes:
 lib/x509/x509.c     |    4 +++-
 lib/x509/x509_int.h |    1 +
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 498eb05..61c8598 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -206,7 +206,7 @@ gnutls_x509_crt_import (gnutls_x509_crt_t cert,
       need_free = 1;
     }
 
-  if (cert->cert)
+  if (cert->expanded)
     {
       /* Any earlier asn1_der_decoding will modify the ASN.1
          structure, so we need to replace it with a fresh
@@ -230,6 +230,8 @@ gnutls_x509_crt_import (gnutls_x509_crt_t cert,
       gnutls_assert ();
       goto cleanup;
     }
+  
+  cert->expanded = 1;
 
   /* Since we do not want to disable any extension
    */
diff --git a/lib/x509/x509_int.h b/lib/x509/x509_int.h
index 1173f95..95aa3a3 100644
--- a/lib/x509/x509_int.h
+++ b/lib/x509/x509_int.h
@@ -50,6 +50,7 @@ typedef struct gnutls_x509_crt_int
 {
   ASN1_TYPE cert;
   int use_extensions;
+  int expanded; /* a certificate has been expanded */
 } gnutls_x509_crt_int;
 
 typedef struct gnutls_x509_crq_int


hooks/post-receive
-- 
GNU gnutls