Updated mini test.

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5e52959c6a7ef8e62541290599f71f7afeb49267..97c6884ccd96d10fbcc3faf4ba5fbd35c237af3f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -60,7 +60,7 @@ libutils_la_SOURCES = utils.h utils.c
 libutils_la_LIBADD = ../gl/libgnu.la
 
 ctests = mini-deflate simple gc set_pkcs12_cred certder certuniqueid   \
-        mpi certificate_set_x509_crl dn parse_ca moredn mini           \
+        mpi certificate_set_x509_crl dn parse_ca moredn record-sizes \
         hostname-check cve-2008-4989 pkcs12_s2k chainverify            \
         crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416         \
         crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain         \

diff --git a/tests/mini.c b/tests/record-sizes.c
similarity index 89%
rename from tests/mini.c
rename to tests/record-sizes.c
index 3fe48f5848970eb5576306508b7c7a35ad0713b0..08c8d2b0d08b7555f8a102f09537dc73556f95e4 100644 (file)
--- a/tests/mini.c
+++ b/tests/record-sizes.c
@@ -41,8 +41,10 @@ tls_log_func (int level, const char *str)
   fprintf (stderr, "%s|<%d>| %s", side, level, str);
 }
 
+/* This test attempts to transfer various sizes using AES-128-CBC.
+ */
+
 #define MAX_BUF 1024
-#define MSG "Hello TLS"
 
 void
 doit (void)
@@ -56,11 +58,12 @@ doit (void)
   /* Client stuff. */
   gnutls_anon_client_credentials_t c_anoncred;
   gnutls_session_t client;
-  int cret = GNUTLS_E_AGAIN;
+  int cret = GNUTLS_E_AGAIN, i;
   /* Need to enable anonymous KX specifically. */
+  char b1[MAX_BUF + 1];
   char buffer[MAX_BUF + 1];
   ssize_t ns;
-  int ret, transferred = 0, msglen;
+  int ret, transferred = 0;
 
   /* General init. */
   global_init ();
@@ -74,7 +77,7 @@ doit (void)
   gnutls_dh_params_import_pkcs3 (dh_params, &p3, GNUTLS_X509_FMT_PEM);
   gnutls_anon_set_server_dh_params (s_anoncred, dh_params);
   gnutls_init (&server, GNUTLS_SERVER);
-  gnutls_priority_set_direct (server, "NONE:+VERS-TLS-ALL:+CIPHER-ALL:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
+  gnutls_priority_set_direct (server, "NONE:+VERS-TLS-ALL:+AES-128-CBC:+MAC-ALL:+SIGN-ALL:+COMP-ALL:+ANON-DH", NULL);
   gnutls_credentials_set (server, GNUTLS_CRD_ANON, s_anoncred);
   gnutls_dh_set_prime_bits (server, 1024);
   gnutls_transport_set_push_function (server, server_push);
@@ -90,13 +93,16 @@ doit (void)
   gnutls_transport_set_pull_function (client, client_pull);
   gnutls_transport_set_ptr (client, (gnutls_transport_ptr_t)client);
 
+  memset(b1, 0, sizeof(b1));
   HANDSHAKE(client, server);
 
   if (debug)
     success ("Handshake established\n");
 
-  msglen = strlen(MSG);
-  TRANSFER(client, server, MSG, msglen, buffer, MAX_BUF);
+  for (i=1;i<128;i++)
+    {
+      TRANSFER(client, server, b1, i, buffer, MAX_BUF);
+    }
   if (debug)
     fputs ("\n", stdout);