[SCM] GNU gnutls branch, master, updated. gnutls_3_1_5-13-geec31cc

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

The branch, master has been updated
       via  eec31cce141049544a512c8e55211f434c691820 (commit)
       via  96d55b5237be54800f60610dac84e447eb94015c (commit)
       via  c9658d930016519e0b44ac284e7414292267e57d (commit)
       via  edc7f26379741687c135175b3fac9d594d316bd7 (commit)
       via  092750ed76ce1853376f9a143147503b4c910503 (commit)
      from  5b15e1660703398e1f799ff5cf795d4b0809ef72 (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 eec31cce141049544a512c8e55211f434c691820
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 26 19:06:34 2012 +0100

    updated todo list

commit 96d55b5237be54800f60610dac84e447eb94015c
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 26 18:51:37 2012 +0100

    gnutls_x509_crt_get_policy() allows for a list of zero policy qualifiers.

commit c9658d930016519e0b44ac284e7414292267e57d
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 26 09:35:11 2012 +0100

    Added hack to print the parameters correctly in windows.

commit edc7f26379741687c135175b3fac9d594d316bd7
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Mon Nov 26 09:30:17 2012 +0100

    updated

commit 092750ed76ce1853376f9a143147503b4c910503
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Nov 25 22:46:20 2012 +0100

    repeat the tests to avoid accidental failures

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

Summary of changes:
 NEWS                           |    3 +++
 doc/TODO                       |    6 ++++++
 lib/x509/x509.c                |    6 +++---
 src/libopts/usage.c            |    7 +++++++
 tests/cert-tests/template-test |   15 +++++++++++++++
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index d85daa3..75eefb5 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,9 @@ See the end for copying conditions.
 
 ** libgnutls: Several updates in the ASN.1 string handling subsystem.
 
+** libgnutls: gnutls_x509_crt_get_policy() allows for a list of zero
+policy qualifiers.
+
 ** API and ABI modifications:
 No changes since last version.
 
diff --git a/doc/TODO b/doc/TODO
index 0eaa06c..b1cea4e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -5,6 +5,12 @@ in order to avoid having people working on the same thing.
 Current list:
 * When importing a PKCS #11 certificate, check for its issuers to generate a
   chain (e.g. use the DN to retrieve possible signers).
+* Handle the following X.509 extensions:
+   2.5.29.36: Policy Constraints
+   2.5.29.33: Policy Mappings
+   2.5.29.54: Inhibit Any-policy
+   2.5.29.46: Freshest CRL
+   2.5.29.30: Name Constraints
 * Improve AES assembly. AES in nettle can be improved in x86, arm and
   x86-64.
 * Add support for RSA-PSS. This signature algorithm is seen in some
diff --git a/lib/x509/x509.c b/lib/x509/x509.c
index 627ffa5..4ece362 100644
--- a/lib/x509/x509.c
+++ b/lib/x509/x509.c
@@ -1967,7 +1967,7 @@ gnutls_x509_crt_get_policy (gnutls_x509_crt_t crt, int 
indx,
       len = sizeof(tmpoid);
       ret = asn1_read_value(c2, tmpstr, tmpoid, &len);
       
-      if (ret == ASN1_ELEMENT_NOT_FOUND && i > 0)
+      if (ret == ASN1_ELEMENT_NOT_FOUND)
         break; /* finished */
       
       if (ret != ASN1_SUCCESS)
@@ -2442,8 +2442,8 @@ gnutls_x509_crt_get_issuer (gnutls_x509_crt_t cert, 
gnutls_x509_dn_t * dn)
  * in turns points to the original certificate. Thus you should not
  * modify any data or deallocate any of those.
  *
- * This is a low-level function that depends on the internals of
- * libtasn1.
+ * This is a low-level function that requires the caller to do the
+ * value conversions when necessary (e.g. from UCS-2).
  *
  * Returns: Returns 0 on success, or an error code.
  **/
diff --git a/src/libopts/usage.c b/src/libopts/usage.c
index ebdc46a..52a271a 100644
--- a/src/libopts/usage.c
+++ b/src/libopts/usage.c
@@ -782,6 +782,13 @@ prt_one_usage(tOptions * pOptions, tOptDesc * pOD, 
arg_types_t * pAT)
         default:                     goto bogus_desc;
         }
 
+#ifdef _WIN32
+        if (pAT->pzOptFmt == zGnuOptFmt)
+            snprintf(z, sizeof(z), "--%s%s", pOD->pz_Name, pzArgType);
+        else if (pAT->pzOptFmt == zGnuOptFmt + 2)
+            snprintf(z, sizeof(z), "%s%s", pOD->pz_Name, pzArgType);
+        else
+#endif
         snprintf(z, sizeof(z), pAT->pzOptFmt, pzArgType, pOD->pz_Name,
                  (pOD->optMinCt != 0) ? pAT->pzReq : pAT->pzOpt);
 
diff --git a/tests/cert-tests/template-test b/tests/cert-tests/template-test
index 876034a..1a54f66 100755
--- a/tests/cert-tests/template-test
+++ b/tests/cert-tests/template-test
@@ -34,6 +34,12 @@ fi
 # time set using datefudge could have changed since the generation
 # (if example the system was busy)
 
+rc=1
+counter=1
+
+while [ "$rc" != "0" -a $counter -le 3 ]
+do
+      
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
     --load-privkey $srcdir/template-test.key \
@@ -42,6 +48,8 @@ datefudge "2007-04-22" \
 
 diff $srcdir/template-test.pem tmp-tt.pem
 rc=$?
+counter=`expr $counter + 1` 
+done
 
 # We're done.
 if test "$rc" != "0"; then
@@ -51,6 +59,11 @@ fi
 
 rm -f tmp-tt.pem
 
+rc=1
+counter=1
+
+while [ "$rc" != "0" -a $counter -le 3 ]
+do
 datefudge "2007-04-22" \
     $CERTTOOL --generate-self-signed \
     --load-privkey $srcdir/template-test.key \
@@ -59,6 +72,8 @@ datefudge "2007-04-22" \
 
 diff $srcdir/template-utf8.pem tmp-tt.pem
 rc=$?
+counter=`expr $counter + 1` 
+done
 
 # We're done.
 if test "$rc" != "0"; then


hooks/post-receive
-- 
GNU gnutls