tests: use %b64[] to base64 data

... instead of storing the data base64 encoded.

Closes #17721

diff --git a/tests/data/test1075 b/tests/data/test1075
index 15d92988c8b140d10e3f3077f85c66c44a2f8e86..37230e1aa10aeec9e9125fcbb80ff6aa6809036c 100644 (file)
--- a/tests/data/test1075
+++ b/tests/data/test1075
@@ -77,7 +77,7 @@ line three
 four is the number of lines
 PUT /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 85\r

diff --git a/tests/data/test1087 b/tests/data/test1087
index f28b62106fdf5c1a9244df94e0dbb93c3ad8cb2f..daf4c8094956e0b1fc8a0c7ae17837e77e5f0111 100644 (file)
--- a/tests/data/test1087
+++ b/tests/data/test1087
@@ -97,7 +97,7 @@ Proxy-Connection: Keep-Alive
 \r
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test1088 b/tests/data/test1088
index e5ae3c2c1112d67236057fc92592f7ca2cc1eb68..11a88fc40ab032443f3918842ea37d2c09fb8935 100644 (file)
--- a/tests/data/test1088
+++ b/tests/data/test1088
@@ -98,14 +98,14 @@ Proxy-Connection: Keep-Alive
 \r
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER1000 HTTP/1.1\r
 Host: first.host.it.is\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/%TESTNUMBER1002 HTTP/1.1\r
 Host: goto.second.host.now\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test1101 b/tests/data/test1101
index a17f2f9717d14515aaaad5f9f63371c5f0f28b86..e70f256abc506fda7f454c322b0db3db5f73ed38 100644 (file)
--- a/tests/data/test1101
+++ b/tests/data/test1101
@@ -45,7 +45,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/gimme/%TESTNUMBER
 <protocol>
 GET /gimme/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1134 b/tests/data/test1134
index 09aea52243bb1d1adc6249140789ecc0f476ef90..4b488fbbe904cb4a71c207edfb5b96cf3d2451ce 100644 (file)
--- a/tests/data/test1134
+++ b/tests/data/test1134
@@ -48,13 +48,13 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u user1:password1 --next http://%HOSTIP:%H
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjE6cGFzc3dvcmQx\r
+Authorization: Basic %b64[user1:password1]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0001 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic MnVzZXI6cGFzc3dvcmQy\r
+Authorization: Basic %b64[2user:password2]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1168 b/tests/data/test1168
index 13dd566179cc3559f94a6a9421b167055f3b59fa..2bba7eccd393629b10e301feb24c2f84df77ead4 100644 (file)
--- a/tests/data/test1168
+++ b/tests/data/test1168
@@ -62,13 +62,13 @@ http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -u "catmai#d:#DZaRJYrixKE*gFY"
 <protocol>
 GET /want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
+Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /data/%TESTNUMBER0002.txt HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic Y2F0bWFpI2Q6I0RaYVJKWXJpeEtFKmdGWQ==\r
+Authorization: Basic %b64[catmai#d:#DZaRJYrixKE*gFY]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1178 b/tests/data/test1178
index db6a745e6f75f2bb243b5ed37a0ebdcddf0b7a7a..ac42ee52de42da054d27213ff4cd3bb1861f401f 100644 (file)
--- a/tests/data/test1178
+++ b/tests/data/test1178
@@ -43,7 +43,7 @@ proxy
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
+Proxy-Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test1204 b/tests/data/test1204
index 0aac591b7140a4fe2abad4388f2dc69b59aa1a83..97bebe7ba6f4b9589338ee5ab028d73aaaa9fcb7 100644 (file)
--- a/tests/data/test1204
+++ b/tests/data/test1204
@@ -69,7 +69,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1212 b/tests/data/test1212
index 56b189c9de4ac82a0cbb02ccf9022ce878f7f2c2..e67878d9062bb098351d30c73288f5ec986987bb 100644 (file)
--- a/tests/data/test1212
+++ b/tests/data/test1212
@@ -43,7 +43,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/ulion/%TESTNUMBER --socks5 non-existing-hos
 <protocol>
 GET /ulion/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1237 b/tests/data/test1237
index 7e49f830d10e43de6755da86c8bb7fbbad6967c2..9fc2377df7fe41e166fbb2248c63f7ef4f49dbb9 100644 (file)
--- a/tests/data/test1237
+++ b/tests/data/test1237
@@ -36,7 +36,7 @@ URL with 1000+ letter user name + password
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic QUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQTpCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI=\r
+Authorization: Basic %b64[AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA:BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1248 b/tests/data/test1248
index c289e8c0bd71389de660eb7829f9247f6eb85a5e..b44d8c004f9d76486e518840359a4860b6da385b 100644 (file)
--- a/tests/data/test1248
+++ b/tests/data/test1248
@@ -41,7 +41,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1249 b/tests/data/test1249
index 554b173ef282736e97a666c272a0ba3c92d18be3..1133509b2a900bba896c4eaaa4975231e3534ebb 100644 (file)
--- a/tests/data/test1249
+++ b/tests/data/test1249
@@ -44,7 +44,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy http://dummy:%NOLISTENP
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1250 b/tests/data/test1250
index 4c47cf2b16d284fa151913e2628497739b067648..6ac154d6d40f390731e5e924624f2feff1920b03 100644 (file)
--- a/tests/data/test1250
+++ b/tests/data/test1250
@@ -42,7 +42,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --noproxy %HOSTIP --max-time 5
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1251 b/tests/data/test1251
index f5db4d3d75968486e9fa7d466a2675456b24f423..aaba5bb7b38cbb029171ffc7be2e4938f8e38772 100644 (file)
--- a/tests/data/test1251
+++ b/tests/data/test1251
@@ -43,7 +43,7 @@ http://user:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --max-time 5
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpzZWNyZXQ=\r
+Authorization: Basic %b64[user:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1259 b/tests/data/test1259
index 3ef77ac81e8220d368b9e975653a1814f3e43df3..981e8d77b790c7f91e72b01fd257dfd6a801ef01 100644 (file)
--- a/tests/data/test1259
+++ b/tests/data/test1259
@@ -36,7 +36,7 @@ HTTP URL with semicolon in password
 <protocol>
 GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpwYXNzO3dvcmQ=\r
+Authorization: Basic %b64[user:pass]b64%O3dvcmQ=\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1296 b/tests/data/test1296
index 65fbdb2dbb51a734baf94db8f361ff45428072a0..316cc63bd71d2ac4de5bd0b35fdea2ec9049f663 100644 (file)
--- a/tests/data/test1296
+++ b/tests/data/test1296
@@ -44,7 +44,7 @@ http://user%0aname:password@%HOSTIP:%HTTPPORT/%TESTNUMBER
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcgpuYW1lOnBhc3N3b3Jk\r
+Authorization: Basic %b64[user%0aname:password]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test1331 b/tests/data/test1331
index 35598960e317e026f9834d01942895b1e3216a6b..ed74623112408f3835f939af90f48ae337bd3a5a 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -81,7 +81,7 @@ Proxy-Connection: Keep-Alive
 \r
 GET http://z.x.com/%TESTNUMBER HTTP/1.1\r
 Host: z.x.com\r
-Proxy-Authorization: Basic bXluYW1lOm15cGFzc3dvcmQ=\r
+Proxy-Authorization: Basic %b64[myname:mypassword]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test1401 b/tests/data/test1401
index 38b3291babf18f3963b0f169a0f712558011b4ee..0356697c94a84699c4d1decf543f598275dc97d3 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -51,7 +51,7 @@ http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 <protocol>
 GET /we/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic ZmFrZTp1c2Vy\r
+Authorization: Basic %b64[fake:user]b64%\r
 User-Agent: MyUA\r
 Accept: */*\r
 Cookie: chocolate=chip\r

diff --git a/tests/data/test1428 b/tests/data/test1428
index 9e7164454a76530312c41b265358d4882a7a4db4..51d7721bce7f51d5332db4ab7cf7ae335411ce2f 100644 (file)
--- a/tests/data/test1428
+++ b/tests/data/test1428
@@ -71,7 +71,7 @@ header-type: proxy
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic aWFtOm15OjtzZWxm\r
+Authorization: Basic %b64[iam:my:;self]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 header-type: server\r

diff --git a/tests/data/test16 b/tests/data/test16
index 86fb55fb885782b215193da7164b63bf89e37957..be3fc8853caea388d8043b6d7083c3a06d03a14e 100644 (file)
--- a/tests/data/test16
+++ b/tests/data/test16
@@ -43,7 +43,7 @@ proxy
 <protocol>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
+Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test1630 b/tests/data/test1630
index d8cdab826fce1a3276a96ea106aeac4fd5c698d4..019928e9f077fdccf728c042b0ca56be8ac7ec3e 100644 (file)
--- a/tests/data/test1630
+++ b/tests/data/test1630
@@ -44,7 +44,7 @@ proxy
 <proxy>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZUB1c2VyOmxvb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29vb29uZw==\r
+Proxy-Authorization: Basic %b64[fake@user:loooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooong]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test167 b/tests/data/test167
index f8ccd2e9a306cf04fb6aaabc7b45818b75b6d460..08262396236d452d5323386cac6b88f207a19589 100644 (file)
--- a/tests/data/test167
+++ b/tests/data/test167
@@ -61,14 +61,14 @@ http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER --proxy http://%
 <protocol>
 GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Basic Zm9vOmJhcg==\r
+Proxy-Authorization: Basic %b64[foo:bar]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://data.from.server.requiring.digest.hohoho.com/%TESTNUMBER HTTP/1.1\r
 Host: data.from.server.requiring.digest.hohoho.com\r
-Proxy-Authorization: Basic Zm9vOmJhcg==\r
+Proxy-Authorization: Basic %b64[foo:bar]b64%\r
 Authorization: Digest username="digest", realm="weirdorealm", nonce="12345", uri="/%TESTNUMBER", response="13c7c02a252cbe1c46d8669898a3be26"\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r

diff --git a/tests/data/test1910 b/tests/data/test1910
index 67dfff9a9797d3a5de87c039a20fa8b9cb2d8b24..2653690200fcc7b24190574a8b3e2b1f5aa516e5 100644 (file)
--- a/tests/data/test1910
+++ b/tests/data/test1910
@@ -52,12 +52,12 @@ lib%TESTNUMBER
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==\r
+Authorization: Basic %b64[user%0aname:pass%0aword]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0002 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcgpuYW1lOnBhc3MKd29yZA==\r
+Authorization: Basic %b64[user%0aname:pass%0aword]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2 b/tests/data/test2
index adbceff097e8d9561b7e634df486224133d82d99..86ec605dba5b810d40da6c58da5b669f68799b4a 100644 (file)
--- a/tests/data/test2
+++ b/tests/data/test2
@@ -39,7 +39,7 @@ HTTP GET with user and password
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic ZmFrZTp1c2Vy\r
+Authorization: Basic %b64[fake:user]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test2023 b/tests/data/test2023
index 57998df96e247a966116ce7c648faaa837836b83..9c3cc94c0a82b89e00b3ed2f58672d68c8deb65c 100644 (file)
--- a/tests/data/test2023
+++ b/tests/data/test2023
@@ -122,27 +122,27 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic basic
 <protocol>
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2024 b/tests/data/test2024
index 8407944a1a394e7ef0e44be031f0e8e92f155256..e79285bc7bbfd689bdae48945dfac55e793ace29 100644 (file)
--- a/tests/data/test2024
+++ b/tests/data/test2024
@@ -137,7 +137,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic digest
 <protocol>
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r
@@ -147,7 +147,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0400 HTTP/1.1\r

diff --git a/tests/data/test2025 b/tests/data/test2025
index f9bfa93aac0d77fab90d833b535bddc8ceabd441..7982b68d22e60e2162b70a564157a619e648c03c 100644 (file)
--- a/tests/data/test2025
+++ b/tests/data/test2025
@@ -219,7 +219,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER basic ntlm
 <protocol>
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r
@@ -234,7 +234,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER0300 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0400 HTTP/1.1\r

diff --git a/tests/data/test2026 b/tests/data/test2026
index f5d1db87e6a64eb8e22d63c900cae74f12168a4b..ee434319d49f98c01bd2e6e5ecd117af6f15eb53 100644 (file)
--- a/tests/data/test2026
+++ b/tests/data/test2026
@@ -182,7 +182,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0300 HTTP/1.1\r
@@ -196,12 +196,12 @@ Accept: */*
 \r
 GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2029 b/tests/data/test2029
index 8bdae5278733a084d58a8fe487838b13db97d0e3..7adadaa57e391d2bacf0cf0d4e4f9fd86f29d5a5 100644 (file)
--- a/tests/data/test2029
+++ b/tests/data/test2029
@@ -202,7 +202,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0300 HTTP/1.1\r
@@ -217,12 +217,12 @@ Accept: */*
 \r
 GET /%TESTNUMBER0400 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6d3JvbmdwYXNz\r
+Authorization: Basic %b64[testuser:wrongpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0500 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test2032 b/tests/data/test2032
index ba32820d6f20e354d21406937fd49e904afbabf8..06aa1ebfacb8245133cc9a6d883f0928d2a3527f 100644 (file)
--- a/tests/data/test2032
+++ b/tests/data/test2032
@@ -91,12 +91,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <protocol>
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER0200 HTTP/1.1\r

diff --git a/tests/data/test2040 b/tests/data/test2040
index 56a6179095971222746cdcd79f49870a4af0f95f..6537d193e3c4151ab46ff4446028aaf9c5de744e 100644 (file)
--- a/tests/data/test2040
+++ b/tests/data/test2040
@@ -50,7 +50,7 @@ HTTP Basic authorization, then without authorization
 <protocol>
 GET /%TESTNUMBER0100 HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Authorization: Basic %b64[testuser:testpass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test208 b/tests/data/test208
index 8d90e3e2b016da8ee8f1e5a56f3b2ef05e7359f4..d66f5cd17a3280cbf520453f171f05b39d7ded9a 100644 (file)
--- a/tests/data/test208
+++ b/tests/data/test208
@@ -53,7 +53,7 @@ the
 <protocol>
 PUT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.com:21\r
-Authorization: Basic ZGFuaWVsOm15c2VjcmV0\r
+Authorization: Basic %b64[daniel:mysecret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test2081 b/tests/data/test2081
index 0a95fb88132c0fea4709eef60ba485d146c7be0c..7aad416215636ba606004272aa499b6a3c1678ab 100644 (file)
--- a/tests/data/test2081
+++ b/tests/data/test2081
@@ -45,13 +45,13 @@ http://user:pass@%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER#anchor --location --r
 <protocol>
 GET /we/want/our/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpwYXNz\r
+Authorization: Basic %b64[user:pass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/our/data/%TESTNUMBER0002.txt?coolsite=yes HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpwYXNz\r
+Authorization: Basic %b64[user:pass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Referer: http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER\r

diff --git a/tests/data/test233 b/tests/data/test233
index e02be2a86ec541ea53b3c8c4629e82e8eecc2653..fa83d750d1449901cd2333ffe8fa6f6dcdf214d9 100644 (file)
--- a/tests/data/test233
+++ b/tests/data/test233
@@ -78,15 +78,15 @@ proxy
 <protocol>
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test234 b/tests/data/test234
index f37d492b567333bd8fc06fb602c7fd5022138aec..2c86c3437ecaa9e10b9feebd11714fc95f7ded86 100644 (file)
--- a/tests/data/test234
+++ b/tests/data/test234
@@ -80,16 +80,16 @@ proxy
 <protocol>
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test242 b/tests/data/test242
index 91aeb381d7ba0ae060a6e7574fbcdf0cbe6d15e9..2e9f89165a985bca6851ddadb6cbcc375b7e5712 100644 (file)
--- a/tests/data/test242
+++ b/tests/data/test242
@@ -43,7 +43,7 @@ HTTP-IPv6 GET with username+password in URL
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOST6IP:%HTTP6PORT\r
-Authorization: Basic Zm9vYmFyOmJhcmZvbw==\r
+Authorization: Basic %b64[foobar:barfoo]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test256 b/tests/data/test256
index f370d73ab9f42c9d5ddfee435bf63c29510fbf43..aa60459548e10987cb78a3239334d10dbccc83d4 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -48,7 +48,7 @@ proxy
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic ZGFuaWVsOnN0ZW5iZXJn\r
+Proxy-Authorization: Basic %b64[daniel:stenberg]b64%\r
 Range: bytes=78-\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r

diff --git a/tests/data/test257 b/tests/data/test257
index 5eabf363ad8c6725f9e0cd09c99ed10873d7ac9a..4a245b0120fe54c69c123edb298ef06ce6c06720 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -88,14 +88,14 @@ machine anotherone.com login user2 password passwd2
 <protocol>
 GET http://supersite.com/want/%TESTNUMBER HTTP/1.1\r
 Host: supersite.com\r
-Authorization: Basic dXNlcjE6cGFzc3dkMQ==\r
+Authorization: Basic %b64[user1:passwd1]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://anotherone.com/%TESTNUMBER0002 HTTP/1.1\r
 Host: anotherone.com\r
-Authorization: Basic dXNlcjI6cGFzc3dkMg==\r
+Authorization: Basic %b64[user2:passwd2]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test264 b/tests/data/test264
index a4ce251524363c9dd7e762c63ba931373a202adc..8eae539bdc03bd2e33714f1193db8e55bb904278 100644 (file)
--- a/tests/data/test264
+++ b/tests/data/test264
@@ -40,7 +40,7 @@ proxy
 <protocol>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
+Proxy-Authorization: Basic %b64[fake:user]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test275 b/tests/data/test275
index d0abcac18485fddad3f7168d120d37176c938cf7..d3a68a4211cf96c7733077649156af67b187b042 100644 (file)
--- a/tests/data/test275
+++ b/tests/data/test275
@@ -67,7 +67,7 @@ proxy
 <proxy>
 CONNECT remotesite.com.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
 Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
+Proxy-Authorization: Basic %b64[youare:yourself]b64%\r
 User-Agent: curl/%VERSION\r
 Proxy-Connection: Keep-Alive\r
 \r
@@ -75,13 +75,13 @@ Proxy-Connection: Keep-Alive
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: remotesite.com.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test278 b/tests/data/test278
index e2daab39f0e76d2d4e2955dd44653f2801cf4783..eebd2e4623fb622ce38212ed294161bd49bed0d0 100644 (file)
--- a/tests/data/test278
+++ b/tests/data/test278
@@ -40,7 +40,7 @@ proxy
 <protocol>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZTo=\r
+Proxy-Authorization: Basic %b64[fake:]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test279 b/tests/data/test279
index 740e351de716faf3da7ad87eeb2f07defa8477a8..627be88f916944966a91bd55ca541b922e0f1817 100644 (file)
--- a/tests/data/test279
+++ b/tests/data/test279
@@ -41,7 +41,7 @@ proxy
 <protocol>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZTo=\r
+Proxy-Authorization: Basic %b64[fake:]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test299 b/tests/data/test299
index fc80c6296f2d862432ba1b4071a501f167e1ae5e..932e065b8b510293aaa20b7b8248a523cec15285 100644 (file)
--- a/tests/data/test299
+++ b/tests/data/test299
@@ -42,7 +42,7 @@ FTP over HTTP proxy with user:pass not in url
 <protocol>
 GET ftp://michal:aybabtu@host.com/we/want/%TESTNUMBER HTTP/1.1\r
 Host: host.com:21\r
-Authorization: Basic bWljaGFsOmF5YmFidHU=\r
+Authorization: Basic %b64[michal:aybabtu]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test3 b/tests/data/test3
index 6c5eb6b7126bfd2edaaf7da6584905c28e3e0bb7..a7cb4f8839edc64448682d55a4c29e42426c1d71 100644 (file)
--- a/tests/data/test3
+++ b/tests/data/test3
@@ -46,7 +46,7 @@ HTTP POST with auth and contents but with content-length set to 0
 <protocol nonewline="yes">
 POST /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic ZmFrZTotdXNlcg==\r
+Authorization: Basic %b64[fake:-user]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Content-Length: 37\r

diff --git a/tests/data/test301 b/tests/data/test301
index a195958988a7e63616e5a66eab8d9c4d1144943b..af394784ecd498fc0edf66bfef8df8b1ffdfcaf0 100644 (file)
--- a/tests/data/test301
+++ b/tests/data/test301
@@ -43,7 +43,7 @@ HTTPS GET with user and password
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPSPORT\r
-Authorization: Basic ZmFrZTp1c2Vy\r
+Authorization: Basic %b64[fake:user]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test3100 b/tests/data/test3100
index 23ec417908d74c25377c498c6d529523947bba0c..32ce6d3bedfb3232ca66c07a2c1585c7e0259e4e 100644 (file)
--- a/tests/data/test3100
+++ b/tests/data/test3100
@@ -77,7 +77,7 @@ Accept: application/sdp
 DESCRIBE rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER RTSP/1.0\r
 CSeq: 2\r
 Accept: application/sdp\r
-Authorization: Basic dXNlcjpwYXNzd29yZA==\r
+Authorization: Basic %b64[user:pass]b64%d29yZA==\r
 \r
 </protocol>
 </verify>

diff --git a/tests/data/test3101 b/tests/data/test3101
index 8e3d41f3a6280bf15e394906d49d1aad59363cd3..d5fd882db06533a1e1d5e8e7dc934834d6c6a752 100644 (file)
--- a/tests/data/test3101
+++ b/tests/data/test3101
@@ -79,7 +79,7 @@ Accept: */*
 \r
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjpwYXNzd29yZA==\r
+Authorization: Basic %b64[user:pass]b64%d29yZA==\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test317 b/tests/data/test317
index 10f0b881778911a7a151c8afda070d0872cb09ea..e510c98b45ca6fdeda38c796c0ee67417b306c80 100644 (file)
--- a/tests/data/test317
+++ b/tests/data/test317
@@ -78,7 +78,7 @@ proxy
 <protocol>
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -86,7 +86,7 @@ Authorization: s3cr3t
 \r
 GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test318 b/tests/data/test318
index 6577db5f925b890be50487014572fad6bff520c3..9f712782be0d50d7044b9ded3c6882ca93e6400c 100644 (file)
--- a/tests/data/test318
+++ b/tests/data/test318
@@ -78,7 +78,7 @@ proxy
 <protocol>
 GET http://first.host.it.is/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: first.host.it.is\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
@@ -86,7 +86,7 @@ Authorization: s3cr3t
 \r
 GET http://goto.second.host.now/%TESTNUMBER0002 HTTP/1.1\r
 Host: goto.second.host.now\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test346 b/tests/data/test346
index c15ae71563a25423d21bdbeb137aa8c4ec619374..a94da860b0e2bf45cec14c5e8ba5c217f7386615 100644 (file)
--- a/tests/data/test346
+++ b/tests/data/test346
@@ -47,8 +47,8 @@ HTTP GET over proxy with credentials using blank passwords
 <protocol>
 GET http://remote.example/%TESTNUMBER HTTP/1.1\r
 Host: remote.example\r
-Proxy-Authorization: Basic cHVzZXI6\r
-Authorization: Basic c3VzZXI6\r
+Proxy-Authorization: Basic %b64[puser:]b64%\r
+Authorization: Basic %b64[suser:]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test367 b/tests/data/test367
index 1ee59cedfd6998a7f25d00fd24bb8623d8d0da8a..bd3bc0a88783d29ff0615bcd20bf749477b734c7 100644 (file)
--- a/tests/data/test367
+++ b/tests/data/test367
@@ -39,7 +39,7 @@ http://:example@%HOSTIP:%HTTPPORT/%TESTNUMBER
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic OmV4YW1wbGU=\r
+Authorization: Basic %b64[:example]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test495 b/tests/data/test495
index deba48ae1cf963c7fb29fb0ccb44efcb54fbcc9a..d7313bac3c8ab7c54dcba42aa865999b347c49a0 100644 (file)
--- a/tests/data/test495
+++ b/tests/data/test495
@@ -47,7 +47,7 @@ http://foo%40bar:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER --netrc-optional
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic Zm9vQGJhcjpzZWNyZXQ=\r
+Authorization: Basic %b64[foo@bar:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test503 b/tests/data/test503
index 9fbc00b951c84c37f139c53b333ce5eb16f6726c..ea2dfcd7f4685ee0981266ad9736a8694f3cd7dd 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -73,7 +73,7 @@ moo
 <proxy>
 CONNECT machine.%TESTNUMBER:%HTTPPORT HTTP/1.1\r
 Host: machine.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: Basic dGVzdCUyMDppbmclNDE=\r
+Proxy-Authorization: Basic %b64[test%2520:ing%2541]b64%\r
 Proxy-Connection: Keep-Alive\r
 \r
 [DISCONNECT]
@@ -81,7 +81,7 @@ Proxy-Connection: Keep-Alive
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: machine.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic dGVzdDppbmc=\r
+Authorization: Basic %b64[test:ing]b64%\r
 Accept: */*\r
 \r
 [DISCONNECT]

diff --git a/tests/data/test519 b/tests/data/test519
index 08e56a2ea68f6af46f8a647f71112cb9741c6701..53f2f19487fa37fe978f409449c88b6ddd96848e 100644 (file)
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -65,12 +65,12 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic bW9uc3Rlcjp1bmRlcmJlZA==\r
+Authorization: Basic %b64[monster:underbed]b64%\r
 Accept: */*\r
 \r
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic YW5vdGhlcm1vbnN0ZXI6aW53YXJkcm9iZQ==\r
+Authorization: Basic %b64[anothermonster:inwardrobe]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test522 b/tests/data/test522
index 3aa053a58434f0052588f2857fdf0e0855bbc77f..cc849f47a66d7b7f93b3e6ef244642cf07f8ae15 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -46,7 +46,7 @@ http://%HOSTIP/%TESTNUMBER %HTTPPORT
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic eHh4Onl5eQ==\r
+Authorization: Basic %b64[xxx:yyy]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test523 b/tests/data/test523
index 2bd5a981987d019723ce22447f26ef3f8d937310..f414bf81d924f864b44648a2743711314d281bb3 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -52,7 +52,7 @@ proxy
 <protocol>
 GET http://www.example.com:19999/%TESTNUMBER HTTP/1.1\r
 Host: www.example.com:19999\r
-Authorization: Basic eHh4Onl5eQ==\r
+Authorization: Basic %b64[xxx:yyy]b64%\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r

diff --git a/tests/data/test63 b/tests/data/test63
index 5f659a6ae354ff4fab3c2e3ae0f213c0e3596331..81d6ffc7e6724c49c70dd6d6dc907196d9c55441 100644 (file)
--- a/tests/data/test63
+++ b/tests/data/test63
@@ -44,7 +44,7 @@ proxy
 <protocol>
 GET http://we.want.that.site.com/%TESTNUMBER HTTP/1.1\r
 Host: we.want.that.site.com\r
-Proxy-Authorization: Basic ZmFrZTp1c2Vy\r
+Proxy-Authorization: Basic %b64[fake:user]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test675 b/tests/data/test675
index 82ae14031f380d1aa46e7a3879c81e671f1fb69b..6688cacc940d8800a8390b45b1da3537e01fc068 100644 (file)
--- a/tests/data/test675
+++ b/tests/data/test675
@@ -40,13 +40,13 @@ proxy
 <protocol>
 GET /user1/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjE6Zm9vMQ==\r
+Authorization: Basic %b64[user1:foo1]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r
 GET /user2/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjI6Zm9vMg==\r
+Authorization: Basic %b64[user2:foo2]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test679 b/tests/data/test679
index 1ad174704c0effce38ee0790831a4f1433b26be5..e57401be46d348045746df2f013656c791590f95 100644 (file)
--- a/tests/data/test679
+++ b/tests/data/test679
@@ -47,7 +47,7 @@ machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
 <protocol>
 GET / HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic dXNlcjE6d2l0aCBzcGFjZXMgYW5kICIKDQlh\r
+Authorization: Basic %b64[user1:with%20spaces%20and%20"%0a%0d%09a]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test699 b/tests/data/test699
index 4d1a2d9ddde21c1be4afc70f3bf76bb6f4e47e96..9725a8dcaeb9c9e091e2820ea7078de1d1d47b63 100644 (file)
--- a/tests/data/test699
+++ b/tests/data/test699
@@ -48,7 +48,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
 <protocol crlf="yes">
 GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Basic aGVqOnlvdQ==
+Authorization: Basic %b64[hej:you]b64%
 User-Agent: curl/%VERSION
 Accept: */*
 

diff --git a/tests/data/test744 b/tests/data/test744
index b35d97b04878a92ffc2e87c3b6519b801e3e7f8d..fbb1cf9516772da20583ecf5cd8fb391075a1c79 100644 (file)
--- a/tests/data/test744
+++ b/tests/data/test744
@@ -71,7 +71,7 @@ Proxy-Connection: Keep-Alive
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: foo.host:%HTTPPORT\r
-Authorization: Basic Zm9vOmJhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYWFhYXI=\r
+Authorization: Basic %b64[foo:baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaar]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test80 b/tests/data/test80
index c6aa05b173d6c7a828a26fa8b300d59bfc74dfa6..2ffcd8987f39c32e459b66096be57ee8c4e217e5 100644 (file)
--- a/tests/data/test80
+++ b/tests/data/test80
@@ -66,14 +66,14 @@ proxy
 <proxy>
 CONNECT test.%TESTNUMBER:%HTTPPORT HTTP/1.0\r
 Host: test.%TESTNUMBER:%HTTPPORT\r
-Proxy-Authorization: Basic eW91YXJlOnlvdXJzZWxm\r
+Proxy-Authorization: Basic %b64[youare:yourself]b64%\r
 Proxy-Connection: Keep-Alive\r
 \r
 </proxy>
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 Accept: */*\r
 \r
 </protocol>

diff --git a/tests/data/test82 b/tests/data/test82
index a4286ad0967b5aa497478b42e1d09a4e835bbfac..c343d0a2de5d28352d9c7afc7ce38caaca363274 100644 (file)
--- a/tests/data/test82
+++ b/tests/data/test82
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER --proxy-user testuser:testpass -x http://%H
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic dGVzdHVzZXI6dGVzdHBhc3M=\r
+Proxy-Authorization: Basic %b64[testuser:testpass]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test83 b/tests/data/test83
index 51a3e3b68ba4e512b85d215bf90df8415d979c64..1d138ce10a1b1555e9a32876236144ff122c8c51 100644 (file)
--- a/tests/data/test83
+++ b/tests/data/test83
@@ -70,7 +70,7 @@ Proxy-Connection: Keep-Alive
 <protocol>
 GET /we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: test.%TESTNUMBER:%HTTPPORT\r
-Authorization: Basic aWFtOm15OjtzZWxm\r
+Authorization: Basic %b64[iam:my:;self]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test84 b/tests/data/test84
index 3b842eaffe8398a3956a8020eca9204a1667f53f..2cbd8a575d471f25005ba1edc21b14542fcbc064 100644 (file)
--- a/tests/data/test84
+++ b/tests/data/test84
@@ -44,7 +44,7 @@ proxy
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test85 b/tests/data/test85
index b70dbb818205b42bd5ee3ae6b34bbccf636574f7..2acc87cb0617d391beb1268a3311ea1a2eb1a6c6 100644 (file)
--- a/tests/data/test85
+++ b/tests/data/test85
@@ -47,8 +47,8 @@ proxy
 <protocol>
 GET http://%HOSTIP:%HTTPPORT/we/want/that/page/%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Proxy-Authorization: Basic dGVzdGluZzp0aGlz\r
-Authorization: Basic aWFtOm15c2VsZg==\r
+Proxy-Authorization: Basic %b64[testing:this]b64%\r
+Authorization: Basic %b64[iam:myself]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test898 b/tests/data/test898
index cffbc629b2894342671338a4a64e1e7c3703969f..4d22862d4a3d02d7d0db8035d440c87f8de1f8d4 100644 (file)
--- a/tests/data/test898
+++ b/tests/data/test898
@@ -67,7 +67,7 @@ http
 HTTP with custom auth and cookies redirected to HTTP on a diff port
 </name>
 <command>
--x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -H "Authorization: Basic am9lOnNlY3JldA==" -H "Cookie: userpwd=am9lOnNlY3JldA=="
+-x http://%HOSTIP:%HTTPPORT http://firsthost.com -L -H "Authorization: Basic %b64[joe:secret]b64%" -H "Cookie: userpwd=am9lOnNlY3JldA=="
 </command>
 </client>
 
@@ -80,7 +80,7 @@ Host: firsthost.com
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 Cookie: userpwd=am9lOnNlY3JldA==\r
 \r
 GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1\r

diff --git a/tests/data/test899 b/tests/data/test899
index 5f163ab29f08eef3ba33e6e2b95f17cd3276e46a..e1d70920c2cbd956fce29398ccd763b5bae6916c 100644 (file)
--- a/tests/data/test899
+++ b/tests/data/test899
@@ -49,13 +49,13 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L
 <protocol crlf="yes">
 GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Basic Zmlyc3Q6c2VjcmV0
+Authorization: Basic %b64[first:secret]b64%
 User-Agent: curl/%VERSION
 Accept: */*
 
 GET /basic-auth/user/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Basic dXNlcjpwYXNz
+Authorization: Basic %b64[user:pass]b64%
 User-Agent: curl/%VERSION
 Accept: */*
 

diff --git a/tests/data/test973 b/tests/data/test973
index 2961ce7c34e2f6d26dd451bbc2fdba4fd22a5b6b..16c9929e06be0ccff6f92c0a9d756ba21324adb0 100644 (file)
--- a/tests/data/test973
+++ b/tests/data/test973
@@ -72,7 +72,7 @@ QUIT
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test974 b/tests/data/test974
index 1e7919c1434f7a65cd03aa44a10901f92465175a..d62933df56e76ab234fffb26a99a61cb79c4f1c0 100644 (file)
--- a/tests/data/test974
+++ b/tests/data/test974
@@ -75,7 +75,7 @@ HTTP with auth redirected to HTTP on a diff port w/o auth
 <protocol>
 GET http://firsthost.com/ HTTP/1.1\r
 Host: firsthost.com\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test975 b/tests/data/test975
index ea44052635b91d0e4da068bf414df700d8a69f64..1add45791016ea7051d0241ca6b6bcecb3c06336 100644 (file)
--- a/tests/data/test975
+++ b/tests/data/test975
@@ -72,7 +72,7 @@ QUIT
 <protocol>
 GET /%TESTNUMBER HTTP/1.1\r
 Host: %HOSTIP:%HTTPPORT\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 \r

diff --git a/tests/data/test976 b/tests/data/test976
index 35c8901454c2270a417f9405ef2bb74d2eeaa114..264444a56ee9cf62dba08ba9c72dc6e9c9325982 100644 (file)
--- a/tests/data/test976
+++ b/tests/data/test976
@@ -75,14 +75,14 @@ HTTP with auth redirected to HTTP on a diff port --location-trusted
 <protocol>
 GET http://firsthost.com/ HTTP/1.1\r
 Host: firsthost.com\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://firsthost.com:9999/a/path/%TESTNUMBER0002 HTTP/1.1\r
 Host: firsthost.com:9999\r
-Authorization: Basic am9lOnNlY3JldA==\r
+Authorization: Basic %b64[joe:secret]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test979 b/tests/data/test979
index 98a7d839145f21db336c687ac555e4ac1218f347..3cfc33a7e89b5d44540ab2faf51d5b23484fa878 100644 (file)
--- a/tests/data/test979
+++ b/tests/data/test979
@@ -49,13 +49,13 @@ http://first:secret@%HOSTIP:%HTTPPORT/%TESTNUMBER -L -u smith:doggie
 <protocol crlf="yes">
 GET /%TESTNUMBER HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Basic c21pdGg6ZG9nZ2ll
+Authorization: Basic %b64[smith:doggie]b64%
 User-Agent: curl/%VERSION
 Accept: */*
 
 GET /user/%TESTNUMBER0002 HTTP/1.1
 Host: %HOSTIP:%HTTPPORT
-Authorization: Basic c21pdGg6ZG9nZ2ll
+Authorization: Basic %b64[smith:doggie]b64%
 User-Agent: curl/%VERSION
 Accept: */*
 

diff --git a/tests/data/test998 b/tests/data/test998
index c3a8f51699b5db7973c0e9804492a8c72f3a2d49..cecc9528567e2d9e8d3549104990341770a6f380 100644 (file)
--- a/tests/data/test998
+++ b/tests/data/test998
@@ -75,14 +75,14 @@ QUIT
 <protocol>
 GET http://somwhere.example/998 HTTP/1.1\r
 Host: somwhere.example\r
-Authorization: Basic YWxiZXJ0bzplaW5zdGVpbg==\r
+Authorization: Basic %b64[alberto:einstein]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r
 \r
 GET http://somewhere.else.example/a/path/9980002 HTTP/1.1\r
 Host: somewhere.else.example\r
-Authorization: Basic YWxiZXJ0bzplaW5zdGVpbg==\r
+Authorization: Basic %b64[alberto:einstein]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r

diff --git a/tests/data/test999 b/tests/data/test999
index 990a8d09a4c294c5e482d7d2228a4b09deda46fd..e46c2ad51b46b06a6c7d90d505a9555a2cbbe823 100644 (file)
--- a/tests/data/test999
+++ b/tests/data/test999
@@ -65,7 +65,7 @@ QUIT
 <protocol>
 GET http://somwhere.example/%TESTNUMBER HTTP/1.1\r
 Host: somwhere.example\r
-Authorization: Basic YWxiZXJ0bzplaW5zdGVpbg==\r
+Authorization: Basic %b64[alberto:einstein]b64%\r
 User-Agent: curl/%VERSION\r
 Accept: */*\r
 Proxy-Connection: Keep-Alive\r