[SCM] GNU gnutls branch, master, updated. gnutls_3_0_7-80-g6877c6f

[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=6877c6f746a7db88407f53646c290e8c44563bf4

The branch, master has been updated
       via  6877c6f746a7db88407f53646c290e8c44563bf4 (commit)
       via  971dcd3e4a9ec2dea780f1e9987eaf0d6f57eba3 (commit)
       via  c04ec01838437072859a4354953e1a47639356d5 (commit)
      from  2017b24fec56f9f6ad19b73b0c758fa0dc48fd6c (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 6877c6f746a7db88407f53646c290e8c44563bf4
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Sat Nov 12 09:49:12 2011 +0100

    document the gpl modules used by gnulib

commit 971dcd3e4a9ec2dea780f1e9987eaf0d6f57eba3
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 11 23:08:51 2011 +0100

    slow tests are not being run using valgrind

commit c04ec01838437072859a4354953e1a47639356d5
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Fri Nov 11 22:48:20 2011 +0100

    distribute pem file

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

Summary of changes:
 cfg.mk                                         |    2 ++
 tests/Makefile.am                              |    6 +++---
 tests/ecdsa/Makefile.am                        |    2 +-
 tests/{safe-renegotiation => slow}/Makefile.am |    8 ++++----
 tests/slow/README                              |    1 +
 tests/{ => slow}/gendh.c                       |    0
 tests/{ => slow}/keygen.c                      |    8 ++++++--
 7 files changed, 17 insertions(+), 10 deletions(-)
 copy tests/{safe-renegotiation => slow}/Makefile.am (88%)
 create mode 100644 tests/slow/README
 rename tests/{ => slow}/gendh.c (100%)
 rename tests/{ => slow}/keygen.c (93%)

diff --git a/cfg.mk b/cfg.mk
index 5c87889..f410ffe 100644
--- a/cfg.mk
+++ b/cfg.mk
@@ -72,6 +72,8 @@ update-po: refresh-po
 bootstrap: autoreconf
        ./configure $(CFGFLAGS)
 
+# The only non-lgpl modules used are: gettime progname timespec. Those
+are not used (and must not be used) in the library)
 glimport:
        gnulib-tool --add-import
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 00d17be..2cb4fd1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,8 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 SUBDIRS = . rsa-md5-collision pkcs1-padding pkcs8-decode pkcs12-decode \
-       userid pathlen key-id sha2 safe-renegotiation dsa scripts ecdsa
+       userid pathlen key-id sha2 safe-renegotiation dsa scripts ecdsa \
+       slow
 
 if ENABLE_OPENPGP
 SUBDIRS += openpgp-certs
@@ -64,8 +65,7 @@ ctests = mini-deflate simple gc set_pkcs12_cred certder 
certuniqueid  \
         crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain         \
         nul-in-x509-names x509_altname pkcs12_encode mini-x509         \
         mini-x509-rehandshake rng-fork mini-eagain-dtls cipher-test    \
-        x509cert x509cert-tl infoaccess keygen #gendh
-#gendh is out because it is too slow in valgrind
+        x509cert x509cert-tl infoaccess
 
 if ENABLE_OPENSSL
 ctests +=  openssl
diff --git a/tests/ecdsa/Makefile.am b/tests/ecdsa/Makefile.am
index 9be864e..7970555 100644
--- a/tests/ecdsa/Makefile.am
+++ b/tests/ecdsa/Makefile.am
@@ -19,7 +19,7 @@
 # along with this file; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-EXTRA_DIST = 
+EXTRA_DIST = bad-key.pem
 
 dist_check_SCRIPTS = ecdsa
 
diff --git a/tests/safe-renegotiation/Makefile.am b/tests/slow/Makefile.am
similarity index 88%
copy from tests/safe-renegotiation/Makefile.am
copy to tests/slow/Makefile.am
index 17d4684..fda6f33 100644
--- a/tests/safe-renegotiation/Makefile.am
+++ b/tests/slow/Makefile.am
@@ -20,16 +20,16 @@
 AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
 AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/includes            \
-       -I$(top_builddir)/lib/includes
+       -I$(top_builddir)/lib/includes \
+       -I$(top_srcdir)/tests/
 
 AM_LDFLAGS = -no-install
 LDADD = ../libutils.la \
        ../../lib/libgnutls.la $(LTLIBGCRYPT) $(LIBSOCKET)
 
-ctests = srn0 srn1 srn2 srn3 srn4 srn5
+ctests = gendh keygen
 
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)
-TESTS_ENVIRONMENT = $(VALGRIND)
 
-EXTRA_DIST = README suppressions.valgrind
+EXTRA_DIST = README
diff --git a/tests/slow/README b/tests/slow/README
new file mode 100644
index 0000000..0f1982c
--- /dev/null
+++ b/tests/slow/README
@@ -0,0 +1 @@
+Those tests are here because they are very slow when run under valgrind.
diff --git a/tests/gendh.c b/tests/slow/gendh.c
similarity index 100%
rename from tests/gendh.c
rename to tests/slow/gendh.c
diff --git a/tests/keygen.c b/tests/slow/keygen.c
similarity index 93%
rename from tests/keygen.c
rename to tests/slow/keygen.c
index aa6365e..3b95479 100644
--- a/tests/keygen.c
+++ b/tests/slow/keygen.c
@@ -33,6 +33,10 @@
 
 #include "utils.h"
 
+#define MAX_TRIES 2
+
+static int sec_param[MAX_TRIES] = {GNUTLS_SEC_PARAM_WEAK, 
GNUTLS_SEC_PARAM_NORMAL};
+
 static void
 tls_log_func (int level, const char *str)
 {
@@ -53,7 +57,7 @@ doit (void)
     if (debug)
         gnutls_global_set_log_level (4711);
 
-    for (i = 0; i < 2; i++)
+    for (i = 0; i < MAX_TRIES; i++)
       {
           for (algorithm = GNUTLS_PK_RSA; algorithm <= GNUTLS_PK_ECC;
                algorithm++)
@@ -71,7 +75,7 @@ doit (void)
                     gnutls_x509_privkey_generate (pkey, algorithm,
                                                   gnutls_sec_param_to_pk_bits
                                                   (algorithm,
-                                                   GNUTLS_SEC_PARAM_NORMAL),
+                                                   sec_param[i]),
                                                   0);
                 if (ret < 0)
                   {


hooks/post-receive
-- 
GNU gnutls