From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 1 Dec 2011 18:27:57 +0000 (+0100)
Subject: cipher-test is now run without valgrind
X-Git-Tag: gnutls_3_0_9~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ff5348e1a704f1a41403a95dcffaa89c78842a64;p=thirdparty%2Fgnutls.git

cipher-test is now run without valgrind
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2cb4fd170c..dc6d83e6ea 100644
--- 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 fda6f33eb8..c8d93dc4cc 100644
--- 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 dfb7ae7a73..a41aac0dd8 100644
--- 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;