[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_7_a-13-gd6248f4

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

The branch, gnutls_2_12_x has been updated
       via  d6248f4bf6cf1e77adbe7a58c6f959dc7d86582c (commit)
       via  b9a0e5ecde66857462921b649392fdefe042d67c (commit)
      from  6d80344f35d1b6331a4338609aba5c7b4b897c27 (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 d6248f4bf6cf1e77adbe7a58c6f959dc7d86582c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jul 31 18:04:37 2011 +0200

    checking converted to gnutls_cert from pcert.

commit b9a0e5ecde66857462921b649392fdefe042d67c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jul 31 18:02:20 2011 +0200

    removed unused variable

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

Summary of changes:
 lib/gnutls_x509.c  |    6 +++---
 lib/x509/privkey.c |    1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 3dbc763..d50f996 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -808,7 +808,7 @@ gnutls_certificate_set_x509_key_mem 
(gnutls_certificate_credentials_t res,
   return 0;
 }
 
-static int check_if_sorted(gnutls_pcert_st * crt, int nr)
+static int check_if_sorted(gnutls_cert * crt, int nr)
 {
 gnutls_x509_crt_t x509;
 char prev_dn[MAX_CN];
@@ -817,7 +817,7 @@ size_t prev_dn_size, dn_size;
 int i, ret;
 
   /* check if the X.509 list is ordered */
-  if (nr > 1 && crt[0].type == GNUTLS_CRT_X509)
+  if (nr > 1 && crt[0].cert_type == GNUTLS_CRT_X509)
     {
 
       for (i=0;i<nr;i++)
@@ -826,7 +826,7 @@ int i, ret;
           if (ret < 0)
             return gnutls_assert_val(ret);
           
-          ret = gnutls_x509_crt_import(x509, &crt[i].cert, 
GNUTLS_X509_FMT_DER);
+          ret = gnutls_x509_crt_import(x509, &crt[i].raw, GNUTLS_X509_FMT_DER);
           if (ret < 0)
             {
               ret = gnutls_assert_val(ret);
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index f48b17b..593c9bc 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -788,7 +788,6 @@ gnutls_x509_privkey_export (gnutls_x509_privkey_t key,
                             size_t * output_data_size)
 {
   const char *msg;
-  int ret;
 
   if (key == NULL)
     {


hooks/post-receive
-- 
GNU gnutls