[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8204 - libmicrohttpd/src/testcurl/https
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8204 - libmicrohttpd/src/testcurl/https |
Date: |
Sun, 8 Feb 2009 21:15:12 -0700 (MST) |
Author: grothoff
Date: 2009-02-08 21:15:12 -0700 (Sun, 08 Feb 2009)
New Revision: 8204
Modified:
libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
libmicrohttpd/src/testcurl/https/tls_test_common.c
Log:
rewrite test, curl at fault:
Modified: libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c 2009-02-08
15:40:48 UTC (rev 8203)
+++ libmicrohttpd/src/testcurl/https/tls_daemon_options_test.c 2009-02-09
04:15:12 UTC (rev 8204)
@@ -119,7 +119,6 @@
{{MHD_GNUTLS_CIPHER_AES_256_CBC, 0}, "AES256-SHA"},
{{0, 0}, NULL}
};
-
fprintf (stderr, "SHA/TLS tests:\n");
cpos = 0;
while (ciphers[cpos].curlname != NULL)
@@ -154,14 +153,27 @@
MHD_OPTION_END);
cpos++;
}
-
+#if 0
+ /* manual inspection of the handshake suggests that CURL will
+ request TLSv1, we send back "SSL3" and CURL takes it *despite*
+ being configured to speak SSL3-only. Notably, the other way
+ round (have curl request SSL3, respond with TLSv1 only)
+ is properly refused by CURL. Either way, this does NOT seem
+ to be a bug in MHD/gnuTLS but rather in CURL; hence this
+ test is commented out here... */
errorCount +=
- test_wrap ("unmatching SSL version", &test_unmatching_ssl_version,
+ test_wrap ("unmatching version: SSL3 vs. TLS",
&test_unmatching_ssl_version,
test_fd, daemon_flags, "AES256-SHA", CURL_SSLVERSION_TLSv1,
MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
MHD_OPTION_PROTOCOL_VERSION, p_ssl3, MHD_OPTION_END);
-
+#endif
+ errorCount +=
+ test_wrap ("unmatching version: TLS vs. SSL3",
&test_unmatching_ssl_version,
+ test_fd, daemon_flags, "AES256-SHA", CURL_SSLVERSION_SSLv3,
+ MHD_OPTION_HTTPS_MEM_KEY, srv_key_pem,
+ MHD_OPTION_HTTPS_MEM_CERT, srv_self_signed_cert_pem,
+ MHD_OPTION_PROTOCOL_VERSION, p_tls, MHD_OPTION_END);
curl_global_cleanup ();
fclose (test_fd);
remove (TEST_FILE_NAME);
Modified: libmicrohttpd/src/testcurl/https/tls_test_common.c
===================================================================
--- libmicrohttpd/src/testcurl/https/tls_test_common.c 2009-02-08 15:40:48 UTC
(rev 8203)
+++ libmicrohttpd/src/testcurl/https/tls_test_common.c 2009-02-09 04:15:12 UTC
(rev 8204)
@@ -168,7 +168,6 @@
curl_easy_cleanup (c);
return errornum;
}
-
curl_easy_cleanup (c);
return CURLE_OK;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8204 - libmicrohttpd/src/testcurl/https,
gnunet <=