[SCM] GNU gnutls branch, master, updated. gnutls-3_0_12-117-gba875c8

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

The branch, master has been updated
       via  ba875c8e39bfcd58c72420756ba08068552b43f6 (commit)
       via  728149e4d2a8b640cd0f26a15500c488756a9ac5 (commit)
       via  d17a3bf548eee65faabba61b253ed7fbca4cee41 (commit)
       via  dc3505746d464b1bbb309c44abebe734b64b19ff (commit)
       via  870a8a1cbb5276ce08aacec27b4fbe5540e39bcd (commit)
       via  3aad2cffe7773925278cd55af22601fa0d9a2807 (commit)
      from  8647efdd4061998c6bf19f70de4ec78310e67741 (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 ba875c8e39bfcd58c72420756ba08068552b43f6
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:15:25 2012 +0100

    Added --leak-check=full to valgrind options.

commit 728149e4d2a8b640cd0f26a15500c488756a9ac5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:14:36 2012 +0100

    updated for new gnutls_ocsp_resp_verify_direct semantics.

commit d17a3bf548eee65faabba61b253ed7fbca4cee41
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:10:23 2012 +0100

    more files to ignore

commit dc3505746d464b1bbb309c44abebe734b64b19ff
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:09:08 2012 +0100

    small fixes

commit 870a8a1cbb5276ce08aacec27b4fbe5540e39bcd
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:06:38 2012 +0100

    Revert "Added gnutls_ocsp_resp_verify() and some sign fixes."
    
    This reverts commit efaa2ee176568fcd009ff2ca9daa1b7fdac4c491.
    
    Conflicts:
    
        lib/x509/ocsp.c

commit 3aad2cffe7773925278cd55af22601fa0d9a2807
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sun Jan 29 16:01:08 2012 +0100

    Revert "Enable valgrind again."
    This commit disabled the suppressions which is required for tests to
    succeed.
    
    This reverts commit 82498bad27645c47222fa932a7caa2e95747980a.

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

Summary of changes:
 .gitignore                            |    1 +
 doc/.gitignore                        |    1 +
 gl/m4/valgrind-tests.m4               |    2 +-
 gl/override/m4/valgrind-tests.m4.diff |   11 +++++++++++
 lib/includes/gnutls/ocsp.h            |    8 ++------
 lib/libgnutls.map                     |    1 -
 lib/x509/ocsp.c                       |   22 ----------------------
 tests/ocsp.c                          |   17 +----------------
 8 files changed, 17 insertions(+), 46 deletions(-)
 create mode 100644 gl/override/m4/valgrind-tests.m4.diff

diff --git a/.gitignore b/.gitignore
index 328727d..023d8eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -440,6 +440,7 @@ po/quot.sed
 po/remove-potcdate.sed
 po/remove-potcdate.sin
 po/stamp-po
+src/invoke-*.menu
 src/Makefile
 src/Makefile.in
 src/benchmark
diff --git a/doc/.gitignore b/doc/.gitignore
index 915c30a..3af24c1 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -30,3 +30,4 @@ alerts.texi
 alert-printlist
 latex/alerts.tex
 latex/functions
+invoke-*.texi
diff --git a/gl/m4/valgrind-tests.m4 b/gl/m4/valgrind-tests.m4
index 6f2790e..077e025 100644
--- a/gl/m4/valgrind-tests.m4
+++ b/gl/m4/valgrind-tests.m4
@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
     AC_CHECK_PROGS(VALGRIND, valgrind)
   fi
 
-  OPTS="-q --error-exitcode=1 --leak-check=full"
+  OPTS="-q --error-exitcode=1 --suppressions=suppressions.valgrind"
 
   if test -n "$VALGRIND" \
      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/gl/override/m4/valgrind-tests.m4.diff 
b/gl/override/m4/valgrind-tests.m4.diff
new file mode 100644
index 0000000..1393d5d
--- /dev/null
+++ b/gl/override/m4/valgrind-tests.m4.diff
@@ -0,0 +1,11 @@
+--- valgrind-tests.m4.orig
++++ valgrind-tests.m4
+@@ -21,7 +21,7 @@ AC_DEFUN([gl_VALGRIND_TESTS],
+     AC_CHECK_PROGS(VALGRIND, valgrind)
+   fi
+ 
+-  OPTS="-q --error-exitcode=1 --leak-check=full"
++  OPTS="-q --error-exitcode=1 --leak-check=full 
--suppressions=suppressions.valgrind"
+ 
+   if test -n "$VALGRIND" \
+      && $VALGRIND $OPTS $SHELL -c 'exit 0' > /dev/null 2>&1; then
diff --git a/lib/includes/gnutls/ocsp.h b/lib/includes/gnutls/ocsp.h
index f2703c0..3c12556 100644
--- a/lib/includes/gnutls/ocsp.h
+++ b/lib/includes/gnutls/ocsp.h
@@ -242,16 +242,12 @@ extern "C"
 
   int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
                                      gnutls_x509_crt_t signercert,
-                                     unsigned *verify,
+                                     unsigned int*verify,
                                      unsigned int flags);
   int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
                               gnutls_x509_trust_list_t trustlist,
-                              unsigned *verify,
+                              unsigned int*verify,
                               unsigned int flags);
-  int gnutls_ocsp_resp_verify_cred (gnutls_ocsp_resp_t resp,
-                        gnutls_certificate_credentials_t cred,
-                        unsigned *verify,
-                        unsigned int flags);
 
 #ifdef __cplusplus
 }
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 98afb74..40765f8 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -773,7 +773,6 @@ GNUTLS_3_0_0 {
        gnutls_priority_ecc_curve_list;
        gnutls_verify_stored_pubkey;
        gnutls_store_pubkey;
-       gnutls_ocsp_resp_verify_cred;
 } GNUTLS_2_12;
 
 GNUTLS_PRIVATE {
diff --git a/lib/x509/ocsp.c b/lib/x509/ocsp.c
index cf9b08a..229a437 100644
--- a/lib/x509/ocsp.c
+++ b/lib/x509/ocsp.c
@@ -2243,25 +2243,3 @@ gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
 
   return rc;
 }
-
-/**
- * gnutls_ocsp_resp_verify_cred:
- * @resp: should contain a #gnutls_ocsp_resp_t structure
- * @trustlist: the certificate credentials structure
- * @verify: output variable with verification status, an 
#gnutls_ocsp_cert_status_t
- * @flags: verification flags, 0 for now.
- *
- * This function is identical to gnutls_ocsp_resp_verify() but would
- * use the trusted anchors from the certificate credentials structure.
- *
- * Returns: On success, %GNUTLS_E_SUCCESS (0) is returned, otherwise a
- *   negative error value.
- **/
-int
-gnutls_ocsp_resp_verify_cred (gnutls_ocsp_resp_t resp,
-                        gnutls_certificate_credentials_t cred,
-                        unsigned int*verify,
-                        unsigned int flags)
-{
-  return gnutls_ocsp_resp_verify( resp, cred->tlist, verify, flags);
-}
diff --git a/tests/ocsp.c b/tests/ocsp.c
index 7f4235a..a707671 100644
--- a/tests/ocsp.c
+++ b/tests/ocsp.c
@@ -1276,21 +1276,6 @@ resp_verify (void)
       exit (1);
     }
 
-  /* check direct verify with issuer (should fail) */
-
-  ret = gnutls_ocsp_resp_verify_direct (resp, issuer, &verify, 0);
-  if (ret < 0)
-    {
-      fail ("gnutls_ocsp_resp_verify_direct (issuer) %d\n", ret);
-      exit (1);
-    }
-
-  if (verify != GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE)
-    {
-      fail ("gnutls_ocsp_resp_verify_direct2 %d\n", verify);
-      exit (1);
-    }
-
   /* check direct verify with cert (should fail) */
 
   ret = gnutls_ocsp_resp_verify_direct (resp, cert, &verify, 0);
@@ -1300,7 +1285,7 @@ resp_verify (void)
       exit (1);
     }
 
-  if (verify != GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE)
+  if (verify != GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER)
     {
       fail ("gnutls_ocsp_resp_verify_direct3 %d\n", verify);
       exit (1);


hooks/post-receive
-- 
GNU gnutls