64 lines
1.7 KiB
Diff
64 lines
1.7 KiB
Diff
|
From 3cd5b375e31fb98e4782dc3a77e7316ad9eb26cf Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Stenberg <daniel@haxx.se>
|
||
|
|
Date: Thu, 4 Oct 2018 15:34:13 +0200
|
||
|
|
Subject: [PATCH] test320: strip out more HTML when comparing
|
||
|
|
|
||
|
|
To make the test case work with different gnutls-serv versions better.
|
||
|
|
|
||
|
|
Reported-by: Kamil Dudka
|
||
|
|
Fixes #3093
|
||
|
|
Closes #3094
|
||
|
|
|
||
|
|
Upstream-commit: 94ad57b0246b5658c2a9139dbe6a80efa4c4e2f3
|
||
|
|
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
||
|
|
---
|
||
|
|
tests/data/test320 | 24 ++++--------------------
|
||
|
|
1 file changed, 4 insertions(+), 20 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/data/test320 b/tests/data/test320
|
||
|
|
index 457a11eb2..87311d4f2 100644
|
||
|
|
--- a/tests/data/test320
|
||
|
|
+++ b/tests/data/test320
|
||
|
|
@@ -62,34 +62,18 @@ simple TLS-SRP HTTPS GET, check user in response
|
||
|
|
HTTP/1.0 200 OK
|
||
|
|
Content-type: text/html
|
||
|
|
|
||
|
|
-
|
||
|
|
-<HTML><BODY>
|
||
|
|
-<CENTER><H1>This is <a href="http://www.gnu.org/software/gnutls">GnuTLS</a></H1></CENTER>
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-
|
||
|
|
-<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></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: %HOSTIP:%HTTPTLSPORT
|
||
|
|
+FINE
|
||
|
|
User-Agent: curl-test-suite
|
||
|
|
Accept: */*
|
||
|
|
|
||
|
|
-</PRE></P>
|
||
|
|
-</BODY></HTML>
|
||
|
|
-
|
||
|
|
</file>
|
||
|
|
<stripfile>
|
||
|
|
-s/^<p>Session ID:.*//
|
||
|
|
+s/^<p>Connected as user 'jsmith'.*/FINE/
|
||
|
|
s/Protocol version:.*[0-9]//
|
||
|
|
s/GNUTLS/GnuTLS/
|
||
|
|
s/(AES[-_])\d\d\d([-_]CBC)/$1NNN$2/
|
||
|
|
+s/^<.*\n//
|
||
|
|
+s/^\n//
|
||
|
|
</stripfile>
|
||
|
|
</verify>
|
||
|
|
|
||
|
|
--
|
||
|
|
2.17.1
|
||
|
|
|