mirror of
https://github.com/curl/curl.git
synced 2026-08-26 20:53:47 +03:00
TLS: drop support for TLS-SRP
The options will simply do nothing. Closes #21965
This commit is contained in:
parent
d169ad68fa
commit
69ac867f98
63 changed files with 133 additions and 932 deletions
|
|
@ -27,10 +27,6 @@
|
|||
# per line.
|
||||
# Lines starting with '#' letters are treated as comments.
|
||||
#
|
||||
# Uses SRP to "a server not supporting it" but modern stunnel versions
|
||||
# silently accept it and remain happy
|
||||
323
|
||||
#
|
||||
594
|
||||
836
|
||||
882
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ test280 test281 test282 test283 test284 test285 test286 test287 test288 \
|
|||
test289 test290 test291 test292 test293 test294 test295 test296 test297 \
|
||||
test298 test299 test300 test301 test302 test303 test304 test305 test306 \
|
||||
test307 test308 test309 test310 test311 test312 test313 test314 test315 \
|
||||
test316 test317 test318 test319 test320 test321 test322 test323 test324 \
|
||||
test316 test317 test318 test319 \
|
||||
test325 test326 test327 test328 test329 test330 test331 test332 test333 \
|
||||
test334 test335 test336 test337 test338 test339 test340 test341 test342 \
|
||||
test343 test344 test345 test346 test347 test348 test349 test350 test351 \
|
||||
|
|
@ -292,7 +292,7 @@ test3400 test3401 \
|
|||
\
|
||||
test4000 test4001
|
||||
|
||||
EXTRA_DIST = $(TESTCASES) DISABLED data-xml1 data320.html \
|
||||
EXTRA_DIST = $(TESTCASES) DISABLED data-xml1 \
|
||||
data1461.txt data1463.txt \
|
||||
data1400.c data1401.c data1402.c data1403.c data1404.c data1405.c data1406.c \
|
||||
data1407.c data1420.c data1465.c data1481.c \
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
<HTML><BODY>
|
||||
<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
|
||||
|
||||
<p>Session ID: <i>003030000100000001000000000000000030330001000000B062410001000000</i></p>
|
||||
<h5>If your browser supports session resuming, then you should see the same session ID, when you press the <b>reload</b> button.</h5>
|
||||
<p>Connected as user 'jsmith'.</p>
|
||||
<P>
|
||||
<TABLE border=1><TR><TD>Protocol version:</TD><TD>TLS1.2</TD></TR>
|
||||
<TR><TD>Key Exchange:</TD><TD>SRP</TD></TR>
|
||||
<TR><TD>Compression</TD><TD>NULL</TD></TR>
|
||||
<TR><TD>Cipher</TD><TD>AES-NNN-CBC</TD></TR>
|
||||
<TR><TD>MAC</TD><TD>SHA1</TD></TR>
|
||||
<TR><TD>Ciphersuite</TD><TD>SRP_SHA_AES_NNN_CBC_SHA1</TD></TR></p></TABLE>
|
||||
<hr><P>Your HTTP header was:<PRE>Host: localhost:9011%CR
|
||||
User-Agent: curl-test-suite%CR
|
||||
Accept: */*%CR
|
||||
%CR
|
||||
</PRE></P>
|
||||
</BODY></HTML>
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTPS
|
||||
HTTP GET
|
||||
TLS-SRP
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Server-side
|
||||
<reply>
|
||||
<data nocheck="yes">
|
||||
%includetext %SRCDIR/data/data%TESTNUMBER.html%
|
||||
</data>
|
||||
</reply>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
httptls+srp
|
||||
</server>
|
||||
<features>
|
||||
TLS-SRP
|
||||
</features>
|
||||
<name>
|
||||
simple TLS-SRP HTTPS GET, check user in response
|
||||
</name>
|
||||
<command>
|
||||
--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword abc -A curl-test-suite https://%HOSTIP:%HTTPTLSPORT
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<file name="%LOGDIR/curl%TESTNUMBER.out" crlf="headers">
|
||||
HTTP/1.0 200 OK
|
||||
Content-type: text/html
|
||||
|
||||
FINE
|
||||
User-Agent: curl-test-suite
|
||||
Accept: */*
|
||||
|
||||
</file>
|
||||
<stripfile>
|
||||
s/^%LTp%GTConnected as user 'jsmith'.*/FINE/
|
||||
s/Protocol version:.*[0-9]//
|
||||
s/GNUTLS/GnuTLS/
|
||||
s/(AES[-_])\d\d\d([-_]CBC)/$1NNN$2/
|
||||
s/^%LT.*\n//
|
||||
s/^\n//
|
||||
</stripfile>
|
||||
</verify>
|
||||
|
||||
</testcase>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTPS
|
||||
TLS-SRP
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
httptls+srp
|
||||
</server>
|
||||
<features>
|
||||
TLS-SRP
|
||||
</features>
|
||||
<name>
|
||||
TLS-SRP with bad username and password
|
||||
</name>
|
||||
<command>
|
||||
--insecure --tlsauthtype SRP --tlsuser baduser --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<errorcode>
|
||||
35
|
||||
</errorcode>
|
||||
</verify>
|
||||
|
||||
</testcase>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTPS
|
||||
TLS-SRP
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
httptls+srp
|
||||
</server>
|
||||
<features>
|
||||
TLS-SRP
|
||||
</features>
|
||||
<name>
|
||||
TLS-SRP with bad password
|
||||
</name>
|
||||
<command>
|
||||
--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPTLSPORT
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<errorcode>
|
||||
35
|
||||
</errorcode>
|
||||
</verify>
|
||||
|
||||
</testcase>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTPS
|
||||
TLS-SRP
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
https
|
||||
</server>
|
||||
<features>
|
||||
TLS-SRP
|
||||
</features>
|
||||
<name>
|
||||
TLS-SRP to non-TLS-SRP server
|
||||
</name>
|
||||
<command>
|
||||
--insecure --tlsauthtype SRP --tlsuser jsmith --tlspassword badpass https://%HOSTIP:%HTTPSPORT/want/%TESTNUMBER
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<errorcode>
|
||||
35
|
||||
</errorcode>
|
||||
</verify>
|
||||
|
||||
</testcase>
|
||||
|
|
@ -1,33 +0,0 @@
|
|||
<?xml version="1.0" encoding="US-ASCII"?>
|
||||
<testcase>
|
||||
<info>
|
||||
<keywords>
|
||||
HTTPS
|
||||
TLS-SRP
|
||||
</keywords>
|
||||
</info>
|
||||
|
||||
# Client-side
|
||||
<client>
|
||||
<server>
|
||||
httptls+srp
|
||||
</server>
|
||||
<features>
|
||||
TLS-SRP
|
||||
</features>
|
||||
<name>
|
||||
TLS-SRP with server cert checking
|
||||
</name>
|
||||
<command> # no --insecure
|
||||
--tlsauthtype SRP --tlsuser jsmith --tlspassword abc https://%HOSTIP:%HTTPTLSPORT/want/fails
|
||||
</command>
|
||||
</client>
|
||||
|
||||
# Verify data after the test has been "shot"
|
||||
<verify>
|
||||
<errorcode>
|
||||
60
|
||||
</errorcode>
|
||||
</verify>
|
||||
|
||||
</testcase>
|
||||
Loading…
Add table
Add a link
Reference in a new issue