added arcfour 40 cipher detection.

diff --git a/src/tests.c b/src/tests.c
index 74060bc69b8fd6b60d52f8b721d9239bbec3f59b..1d4e5ed5ffddea35ab1742327cc771701c82ffa2 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -469,6 +469,20 @@ int ret;
        return ret;
 }
 
+int test_arcfour_40( gnutls_session session) {
+int ret;
+       ADD_CIPHER(session, GNUTLS_CIPHER_ARCFOUR_40);
+       ADD_ALL_COMP(session);
+       ADD_ALL_CERTTYPES(session);
+       ADD_ALL_PROTOCOLS(session);
+       ADD_ALL_MACS(session);
+       ADD_ALL_KX(session);
+       gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
+
+       ret = do_handshake( session);
+       return ret;
+}
+
 int test_tls1( gnutls_session session) {
 int ret;
        ADD_ALL_CIPHERS(session);

diff --git a/src/tests.h b/src/tests.h
index caa589c4d5894c8a3ff392d8ed670af8eeb80147..d3c3a6fd2cc20d2664b103542b6d577b0052b5b3 100644 (file)
--- a/src/tests.h
+++ b/src/tests.h
@@ -14,6 +14,7 @@ int test_sha( gnutls_session state);
 int test_rmd( gnutls_session state);
 int test_3des( gnutls_session state);
 int test_arcfour( gnutls_session state);
+int test_arcfour_40( gnutls_session state);
 int test_tls1( gnutls_session state);
 int test_tls1_2( gnutls_session state);
 int test_rsa_pms( gnutls_session state);

diff --git a/src/tls_test.c b/src/tls_test.c
index bf7691b6186d3f9320b36b6341631868417d5b15..7c6097feeb7c4b64b9dab5face011a1e7d6b861e 100644 (file)
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -108,7 +108,8 @@ static const TLS_TEST tls_tests[] = {
        { "for ephemeral Diffie Hellman prime size", test_dhe_bits, "", "N/A", "N/A" },
        { "for AES cipher support (TLS extension)", test_aes, "yes", "no", "dunno"},
        { "for 3DES cipher support", test_3des, "yes", "no", "dunno"},
-       { "for ARCFOUR cipher support", test_arcfour, "yes", "no", "dunno"},
+       { "for ARCFOUR 128 cipher support", test_arcfour, "yes", "no", "dunno"},
+       { "for ARCFOUR 40 cipher support", test_arcfour_40, "yes", "no", "dunno"},
        { "for MD5 MAC support", test_md5, "yes", "no", "dunno"},
        { "for SHA1 MAC support", test_sha, "yes", "no", "dunno"},
        { "for RIPEMD160 MAC support (TLS extension)", test_rmd, "yes", "no", "dunno"},
@@ -121,7 +122,7 @@ static const TLS_TEST tls_tests[] = {
        { "for SRP authentication support (TLS extension)", test_srp, "yes", "no", "dunno" },
 #endif
        { "for OpenPGP authentication support (TLS extension)", test_openpgp1, "yes", "no", "dunno" },
-       { NULL }
+       { NULL, NULL, NULL, NULL, NULL }
 };
 
 static int tt = 0;