tests: include chacha20 into transfer tests

diff --git a/tests/mini-record-2.c b/tests/mini-record-2.c
index 1b2f65c555e4708295224a683605cfb654208d15..0be2f928ce5ba622abe633518180c7d5bd026f06 100644 (file)
--- a/tests/mini-record-2.c
+++ b/tests/mini-record-2.c
@@ -422,6 +422,7 @@ static void start(const char *prio, int ign)
 #define ARCFOUR_SHA1_ZLIB "NONE:+VERS-TLS1.0:-CIPHER-ALL:+ARCFOUR-128:+SHA1:+SIGN-ALL:+COMP-DEFLATE:+ANON-ECDH:+CURVE-ALL"
 
 #define AES_GCM_ZLIB "NONE:+VERS-TLS1.2:-CIPHER-ALL:+AES-128-GCM:+AEAD:+SIGN-ALL:+COMP-DEFLATE:+RSA:+CURVE-ALL"
+#define CHACHA_POLY1305 "NONE:+VERS-TLS1.2:-CIPHER-ALL:+RSA:+CHACHA20-POLY1305:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-RSA:+CURVE-ALL"
 
 static void ch_handler(int sig)
 {
@@ -452,6 +453,7 @@ void doit(void)
 
        start(ARCFOUR_SHA1, 0);
        start(ARCFOUR_MD5, 0);
+       start(CHACHA_POLY1305, 0);
 
 # ifdef HAVE_LIBZ
        start(ARCFOUR_SHA1_ZLIB, 0);

diff --git a/tests/mini-record.c b/tests/mini-record.c
index 9f76b2ff075f8528c9a8a25b644535d45242c027..c85947167c52bce852925a69e02261d6643084c1 100644 (file)
--- a/tests/mini-record.c
+++ b/tests/mini-record.c
@@ -381,6 +381,7 @@ static void start(const char *prio)
 #define AES_CBC "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+AES-128-CBC:+SHA1:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define AES_CBC_SHA256 "NONE:+VERS-DTLS1.0:-CIPHER-ALL:+RSA:+AES-128-CBC:+AES-256-CBC:+SHA256:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
 #define AES_GCM "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+AES-128-GCM:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-ECDH:+CURVE-ALL"
+#define CHACHA_POLY1305 "NONE:+VERS-DTLS1.2:-CIPHER-ALL:+RSA:+CHACHA20-POLY1305:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ECDHE-RSA:+CURVE-ALL"
 
 static void ch_handler(int sig)
 {
@@ -405,6 +406,9 @@ void doit(void)
        start(AES_CBC);
        start(AES_CBC_SHA256);
        start(AES_GCM);
+#ifndef ENABLE_FIPS140
+       start(CHACHA_POLY1305);
+#endif
 }
 
 #endif                         /* _WIN32 */