cipher-test is now run without valgrind

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2cb4fd170c01aa65768a886f622b8b5543fdf38a..dc6d83e6eaba385bf61ae46238e5b5142de8e3f9 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -64,7 +64,7 @@ ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid  \
         crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416         \
         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    \
+        mini-x509-rehandshake rng-fork mini-eagain-dtls        \
         x509cert x509cert-tl infoaccess
 
 if ENABLE_OPENSSL

diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am
index fda6f33eb852264a98d57d34cf25b1d284e4bc6f..c8d93dc4ccff204e6cbd2c03093ee4194bd84c1c 100644 (file)
--- a/tests/slow/Makefile.am
+++ b/tests/slow/Makefile.am
@@ -27,7 +27,7 @@ AM_LDFLAGS = -no-install
 LDADD = ../libutils.la \
        ../../lib/libgnutls.la $(LTLIBGCRYPT) $(LIBSOCKET)
 
-ctests = gendh keygen
+ctests = gendh keygen cipher-test
 
 check_PROGRAMS = $(ctests)
 TESTS = $(ctests)

diff --git a/tests/cipher-test.c b/tests/slow/cipher-test.c
similarity index 99%
rename from tests/cipher-test.c
rename to tests/slow/cipher-test.c
index dfb7ae7a7378c8bbddbd4e1c14bda33f89f70a2d..a41aac0dd8b2e8751e5b7564e84e4041abda5284 100644 (file)
--- a/tests/cipher-test.c
+++ b/tests/slow/cipher-test.c
@@ -1,9 +1,3 @@
-/*
- * Demo on how to use /dev/ncr device for HMAC.
- *
- * Placed under public domain.
- *
- */
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
@@ -11,6 +5,11 @@
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 
+/* This does check the AES and SHA implementation against test vectors.
+ * This should not run under valgrind in order to use the native
+ * cpu instructions (AES-NI or padlock).
+ */
+
 struct aes_vectors_st
 {
     const uint8_t *key;