From a7e8f4aabcb7f5b46e0dd94a9645c5cd2744f9da Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 19 Jan 2012 22:54:57 +0100 Subject: testtrace.c: fix compiler warning --- tests/libtest/testtrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/libtest/testtrace.c b/tests/libtest/testtrace.c index 9c082394e..5cb5fec5e 100644 --- a/tests/libtest/testtrace.c +++ b/tests/libtest/testtrace.c @@ -111,7 +111,7 @@ int libtest_debug_cb(CURL *handle, curl_infotype type, switch (type) { case CURLINFO_TEXT: - fprintf(stderr, "%s== Info: %s", timebuf, data); + fprintf(stderr, "%s== Info: %s", &timebuf[0], data); default: /* in case a new one is introduced to shock us */ return 0; -- cgit v1.2.3 From c11c30a8c8d727dcf5634fa0cc6ee0b4b77ddc3d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 11 Jan 2012 15:46:19 +0100 Subject: tests: test CRLF in URLs Related to the security vulnerability: CVE-2012-0036 Bug: http://curl.haxx.se/docs/adv_20120124.html --- tests/data/Makefile.am | 2 +- tests/data/test1322 | 29 +++++++++++++++++++++++++++++ tests/data/test1323 | 29 +++++++++++++++++++++++++++++ tests/data/test1324 | 29 +++++++++++++++++++++++++++++ 4 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 tests/data/test1322 create mode 100644 tests/data/test1323 create mode 100644 tests/data/test1324 (limited to 'tests') diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 85a6e4b2f..610243c24 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -82,7 +82,7 @@ test1220 \ test1300 test1301 test1302 test1303 test1304 test1305 \ test1306 test1307 test1308 test1309 test1310 test1311 test1312 test1313 \ test1314 test1315 test1316 test1317 test1318 test1319 test1320 test1321 \ -test1325 test1326 test1327 \ +test1322 test1323 test1324 test1325 test1326 test1327 \ test2000 test2001 test2002 test2003 test2004 EXTRA_DIST = $(TESTCASES) DISABLED diff --git a/tests/data/test1322 b/tests/data/test1322 new file mode 100644 index 000000000..996727e94 --- /dev/null +++ b/tests/data/test1322 @@ -0,0 +1,29 @@ + + + +POP3 +CRLF-in-URL + + + +# Client-side + + +pop3 + + +POP3 with URL-encoded CR LF in the URL + + +pop3://%HOSTIP:%POP3PORT/%0d%0a/1322 + + + +# + +# 3 - CURLE_URL_MALFORMAT + +3 + + + diff --git a/tests/data/test1323 b/tests/data/test1323 new file mode 100644 index 000000000..90eb88b7d --- /dev/null +++ b/tests/data/test1323 @@ -0,0 +1,29 @@ + + + +SMTP +CRLF-in-URL + + + +# Client-side + + +smtp + + +SMTP with URL-encoded CR LF in the URL + + +smtp://%HOSTIP:%SMTPPORT/%0d%0a/1323 + + + +# + +# 3 - CURLE_URL_MALFORMAT + +3 + + + diff --git a/tests/data/test1324 b/tests/data/test1324 new file mode 100644 index 000000000..c9835efea --- /dev/null +++ b/tests/data/test1324 @@ -0,0 +1,29 @@ + + + +IMAP +CRLF-in-URL + + + +# Client-side + + +imap + + +IMAP with URL-encoded CR LF in the URL + + +imap://%HOSTIP:%IMAPPORT/%0d%0a/1322 + + + +# + +# 3 - CURLE_URL_MALFORMAT + +3 + + + -- cgit v1.2.3 From e277d3b52be73f390e3c806a0fa5185c2527e7be Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Wed, 25 Jan 2012 11:50:44 +0100 Subject: test harness: update stunnel.pem Diffie-Hellman parameters from 512 to 1024 bit --- tests/stunnel.pem | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/stunnel.pem b/tests/stunnel.pem index 1b4d66993..6a3859b33 100644 --- a/tests/stunnel.pem +++ b/tests/stunnel.pem @@ -137,6 +137,7 @@ Ft896NmH4QFsDAetZcCFf24AM4DbUQo5jtG+dkanI/7IxxNYJ1PQ64/yscdQFvHW xhIX3Q6FqABjcN5nc80Rog+b6eS8QRX1BRnQqbGtocuptUgW5mWsSb+DR6pZbA== -----END CERTIFICATE----- -----BEGIN DH PARAMETERS----- -MEYCQQD+KCcagSasA1QSo8tRXpbaLJJ1Ezt3FJFEZ3RVplp4qZwXQpSZ+Vly3xWx -q3YvALe/enMbIq8F3OUmppq3UHwTAgEC +MIGHAoGBAMq/KFGh2oy16WzkFs1U71Uz7dIEKvSYfc+zo439pYyVzcD8MkcC15Zb +ayK3jPBYf07eKzc2TvI3/ZSducmECNP8gk2gAndP1P1rmpheN+owZJS7kQVfQmHl +UmT87U99NPaMHXMNOsFj/3mbAaANndKEnd8PM2r5fg16C4+2e5KzAgEC -----END DH PARAMETERS----- -- cgit v1.2.3