diff options
Diffstat (limited to 'tests')
53 files changed, 1343 insertions, 444 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index d6c20a3f..0656334d 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -350,8 +350,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ @@ -473,9 +477,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/Makefile + $(AUTOMAKE) --foreign tests/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/tests/README b/tests/README index 16a8f06e..bfd234a1 100644 --- a/tests/README +++ b/tests/README @@ -216,27 +216,12 @@ The curl Test Suite 2.1 Test case numbering - 1 - 99 HTTP - 100 - 199 FTP - 200 - 299 FILE - 300 - 399 HTTPS - 400 - 499 FTPS - 500 - 599 libcurl source code tests, not using the curl command tool - 600 - 699 SCP/SFTP - 700 - 799 SOCKS4 (even numbers) and SOCK5 (odd numbers) - 800 - 849 IMAP - 850 - 899 POP3 - 900 - 999 SMTP - 1000 - 1299 miscellaneous - 1300 - 1399 unit tests - 1400 - 1499 miscellaneous - 1500 - 1599 libcurl source code tests, not using the curl command tool - (same as 5xx) - 1600 - 1699 unit tests - 2000 - x multiple sequential protocols per test case - - There's nothing in the system that *requires* us to keep within these number - series. + Test cases used to be numbered by category, but the ranges filled + up. Subsets of tests can now be selected by passing keywords to the + runtests.pl script via the make TFLAGS variable. + + New tests should now be added by finding a free number in + tests/data/Makefile.inc. 3. Write tests diff --git a/tests/certs/Makefile.in b/tests/certs/Makefile.in index a47ac5b5..e0da0550 100644 --- a/tests/certs/Makefile.in +++ b/tests/certs/Makefile.in @@ -329,8 +329,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ diff --git a/tests/certs/scripts/Makefile.in b/tests/certs/scripts/Makefile.in index 64f4244e..f709d2cf 100644 --- a/tests/certs/scripts/Makefile.in +++ b/tests/certs/scripts/Makefile.in @@ -269,8 +269,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ diff --git a/tests/data/Makefile.in b/tests/data/Makefile.in index 246ffa32..ef61ac81 100644 --- a/tests/data/Makefile.in +++ b/tests/data/Makefile.in @@ -291,8 +291,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ @@ -395,7 +399,7 @@ 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 \ test325 test326 test327 test328 test329 test330 test331 test332 test333 \ -test334 \ +test334 test335 \ test340 \ \ test350 test351 test352 test353 test354 test355 test356 \ @@ -431,20 +435,21 @@ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ test818 test819 test820 test821 test822 test823 test824 test825 test826 \ test827 test828 test829 test830 test831 test832 test833 test834 test835 \ test836 test837 test838 test839 test840 test841 test842 test843 test844 \ -test845 test846 test847 \ +test845 test846 test847 test848 test849 \ \ test850 test851 test852 test853 test854 test855 test856 test857 test858 \ test859 test860 test861 test862 test863 test864 test865 test866 test867 \ test868 test869 test870 test871 test872 test873 test874 test875 test876 \ test877 test878 test879 test880 test881 test882 test883 test884 test885 \ -test886 test887 test888 test889 test890 test891 \ +test886 test887 test888 test889 test890 test891 test892 test893 \ \ test900 test901 test902 test903 test904 test905 test906 test907 test908 \ test909 test910 test911 test912 test913 test914 test915 test916 test917 \ test918 test919 test920 test921 test922 test923 test924 test925 test926 \ test927 test928 test929 test930 test931 test932 test933 test934 test935 \ test936 test937 test938 test939 test940 test941 test942 test943 test944 \ -test945 test946 test947 test948 test949 test950 test951 test952 \ +test945 test946 test947 test948 test949 test950 test951 test952 test953 \ +test954 \ \ test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \ test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \ @@ -467,7 +472,7 @@ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ test1160 test1161 test1162 test1163 test1164 test1165 \ -test1170 test1171 test1172 test1173 \ +test1170 test1171 test1172 test1173 test1174 \ \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ @@ -478,7 +483,7 @@ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ test1260 test1261 test1262 test1263 test1264 test1265 test1266 test1267 \ -test1268 \ +test1268 test1269 \ \ test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ test1288 test1289 test1290 test1291 test1292 \ @@ -515,7 +520,7 @@ test1540 test1541 \ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \ test1558 test1559 test1560 test1561 test1562 test1563 \ \ -test1590 test1591 test1592 test1593 \ +test1590 test1591 test1592 test1593 test1594 \ \ test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \ test1608 test1609 test1620 test1621 \ @@ -537,7 +542,8 @@ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \ test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \ test2064 test2065 test2066 test2067 test2068 test2069 \ - test2071 test2072 test2073 test2074 test2075 test2076 \ + test2071 test2072 test2073 test2074 test2075 test2076 test2077 \ +test2078 \ test2080 \ test2100 \ \ @@ -558,9 +564,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/Ma exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/data/Makefile'; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \ $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --gnu tests/data/Makefile + $(AUTOMAKE) --foreign tests/data/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc index 6ec5a3c1..fc22c2f1 100644 --- a/tests/data/Makefile.inc +++ b/tests/data/Makefile.inc @@ -57,7 +57,7 @@ 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 \ test325 test326 test327 test328 test329 test330 test331 test332 test333 \ -test334 \ +test334 test335 \ test340 \ \ test350 test351 test352 test353 test354 test355 test356 \ @@ -93,20 +93,21 @@ test809 test810 test811 test812 test813 test814 test815 test816 test817 \ test818 test819 test820 test821 test822 test823 test824 test825 test826 \ test827 test828 test829 test830 test831 test832 test833 test834 test835 \ test836 test837 test838 test839 test840 test841 test842 test843 test844 \ -test845 test846 test847 \ +test845 test846 test847 test848 test849 \ \ test850 test851 test852 test853 test854 test855 test856 test857 test858 \ test859 test860 test861 test862 test863 test864 test865 test866 test867 \ test868 test869 test870 test871 test872 test873 test874 test875 test876 \ test877 test878 test879 test880 test881 test882 test883 test884 test885 \ -test886 test887 test888 test889 test890 test891 \ +test886 test887 test888 test889 test890 test891 test892 test893 \ \ test900 test901 test902 test903 test904 test905 test906 test907 test908 \ test909 test910 test911 test912 test913 test914 test915 test916 test917 \ test918 test919 test920 test921 test922 test923 test924 test925 test926 \ test927 test928 test929 test930 test931 test932 test933 test934 test935 \ test936 test937 test938 test939 test940 test941 test942 test943 test944 \ -test945 test946 test947 test948 test949 test950 test951 test952 \ +test945 test946 test947 test948 test949 test950 test951 test952 test953 \ +test954 \ \ test1000 test1001 test1002 test1003 test1004 test1005 test1006 test1007 \ test1008 test1009 test1010 test1011 test1012 test1013 test1014 test1015 \ @@ -129,7 +130,7 @@ test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \ test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \ test1152 test1153 test1154 test1155 test1156 test1157 test1158 test1159 \ test1160 test1161 test1162 test1163 test1164 test1165 \ -test1170 test1171 test1172 test1173 \ +test1170 test1171 test1172 test1173 test1174 \ \ test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \ test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \ @@ -140,7 +141,7 @@ test1236 test1237 test1238 test1239 test1240 test1241 test1242 test1243 \ test1244 test1245 test1246 test1247 test1248 test1249 test1250 test1251 \ test1252 test1253 test1254 test1255 test1256 test1257 test1258 test1259 \ test1260 test1261 test1262 test1263 test1264 test1265 test1266 test1267 \ -test1268 \ +test1268 test1269 \ \ test1280 test1281 test1282 test1283 test1284 test1285 test1286 test1287 \ test1288 test1289 test1290 test1291 test1292 \ @@ -177,7 +178,7 @@ test1540 test1541 \ test1550 test1551 test1552 test1553 test1554 test1555 test1556 test1557 \ test1558 test1559 test1560 test1561 test1562 test1563 \ \ -test1590 test1591 test1592 test1593 \ +test1590 test1591 test1592 test1593 test1594 \ \ test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \ test1608 test1609 test1620 test1621 \ @@ -199,7 +200,8 @@ test2040 test2041 test2042 test2043 test2044 test2045 test2046 test2047 \ test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \ test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \ test2064 test2065 test2066 test2067 test2068 test2069 \ - test2071 test2072 test2073 test2074 test2075 test2076 \ + test2071 test2072 test2073 test2074 test2075 test2076 test2077 \ +test2078 \ test2080 \ test2100 \ \ diff --git a/tests/data/test1002 b/tests/data/test1002 index d12046e5..c20995d9 100644 --- a/tests/data/test1002 +++ b/tests/data/test1002 @@ -103,6 +103,14 @@ Expect: 100-continue st GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
+Content-Range: bytes 2-4/5
+User-Agent: curl/7.16.1
+Accept: */*
+Proxy-Connection: Keep-Alive
+Content-Length: 0
+
+GET http://%HOSTIP:%HTTPPORT/1002.upload2 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
Authorization: Digest username="auser", realm="testrealm", nonce="1053604144", uri="/1002.upload2", response="d711f0d2042786d930de635ba0d1a1d0"
Content-Range: bytes 2-4/5
User-Agent: curl/7.16.1
diff --git a/tests/data/test1135 b/tests/data/test1135 index 3591a543..eca6860f 100644 --- a/tests/data/test1135 +++ b/tests/data/test1135 @@ -91,6 +91,7 @@ CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle, CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle, CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle, CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle, +CURL_EXTERN CURLMcode curl_multi_poll(CURLM *multi_handle, CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle, CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle); CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle, diff --git a/tests/data/test1174 b/tests/data/test1174 new file mode 100644 index 00000000..b316fde8 --- /dev/null +++ b/tests/data/test1174 @@ -0,0 +1,50 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP/0.9 +</keywords> +</info> + +# +# Server-side +<reply> +<data> +-foo- swsclose +</data> +<datacheck> +</datacheck> +</reply> + +# +# Client-side +<client> +<server> +http +</server> + <name> +HTTP/0.9 GET response denied by default + </name> + <command> +http://%HOSTIP:%HTTPPORT/1174 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1174 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +# unsupported protocol +<errorcode> +1 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1269 b/tests/data/test1269 new file mode 100644 index 00000000..c7766363 --- /dev/null +++ b/tests/data/test1269 @@ -0,0 +1,34 @@ +<testcase> +<info> +<keywords> +--retry-delay +</keywords> +</info> + +# +# Server-side +<reply> +</reply> + +# +# Client-side +<client> +<server> +none +</server> + <name> +too large --retry-delay value + </name> + <command> +--retry 3 --retry-delay 9223372036854776 http://%HOSTIP:%HTTPPORT/1269 +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<errorcode> +2 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test1291 b/tests/data/test1291 index 3f157518..a2e505fc 100644 --- a/tests/data/test1291 +++ b/tests/data/test1291 @@ -21,7 +21,7 @@ HTTP PUT none </server> <name> -Attempt to upload 100K files but fail immediately +Attempt to upload 1000 files but fail immediately </name> <command> -K log/cmd1291 --fail-early @@ -31,7 +31,7 @@ XXXXXXXx </file> # generate the config file <precheck> -perl -e 'for(1 .. 100000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/1291\n", $_);}' > log/cmd1291; +perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/1291\n", $_);}' > log/cmd1291; </precheck> </client> @@ -40,11 +40,5 @@ perl -e 'for(1 .. 100000) { printf("upload-file=log/upload-this\nurl=htttttp://n <errorcode> 1 </errorcode> - -# we disable valgrind here since it takes 40+ seconds even on a fairly snappy -# machine -<valgrind> -disable -</valgrind> </verify> </testcase> diff --git a/tests/data/test1401 b/tests/data/test1401 index 647f036f..ec3b25cc 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -88,7 +88,6 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_HTTPHEADER, slist1); curl_easy_setopt(hnd, CURLOPT_USERAGENT, "MyUA"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); - curl_easy_setopt(hnd, CURLOPT_HTTP09_ALLOWED, 1L); curl_easy_setopt(hnd, CURLOPT_COOKIE, "chocolate=chip"); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); diff --git a/tests/data/test1402 b/tests/data/test1402 index b9f52f2e..bf7eb7b8 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -80,7 +80,6 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_POSTFIELDSIZE_LARGE, (curl_off_t)16); curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); - curl_easy_setopt(hnd, CURLOPT_HTTP09_ALLOWED, 1L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); diff --git a/tests/data/test1403 b/tests/data/test1403 index db13081b..731d274b 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -75,7 +75,6 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_URL, "http://%HOSTIP:%HTTPPORT/we/want/1403?foo=bar&baz=quux"); curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); - curl_easy_setopt(hnd, CURLOPT_HTTP09_ALLOWED, 1L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); diff --git a/tests/data/test1404 b/tests/data/test1404 index e976f0b3..d3c66a9d 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -146,7 +146,6 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_MIMEPOST, mime1); curl_easy_setopt(hnd, CURLOPT_USERAGENT, "stripped"); curl_easy_setopt(hnd, CURLOPT_MAXREDIRS, 50L); - curl_easy_setopt(hnd, CURLOPT_HTTP09_ALLOWED, 1L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); diff --git a/tests/data/test1406 b/tests/data/test1406 index ab835d3c..8803c846 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -76,13 +76,13 @@ int main(int argc, char *argv[]) hnd = curl_easy_init(); curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L); - curl_easy_setopt(hnd, CURLOPT_INFILESIZE_LARGE, (curl_off_t)38); curl_easy_setopt(hnd, CURLOPT_URL, "smtp://%HOSTIP:%SMTPPORT/1406"); curl_easy_setopt(hnd, CURLOPT_UPLOAD, 1L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); curl_easy_setopt(hnd, CURLOPT_MAIL_FROM, "sender@example.com"); curl_easy_setopt(hnd, CURLOPT_MAIL_RCPT, slist1); + curl_easy_setopt(hnd, CURLOPT_INFILESIZE_LARGE, (curl_off_t)38); /* Here is a list of options the curl code used that cannot get generated as source easily. You may select to either not use them or implement diff --git a/tests/data/test1412 b/tests/data/test1412 index ae63290e..36d3d1d9 100644 --- a/tests/data/test1412 +++ b/tests/data/test1412 @@ -25,6 +25,19 @@ Connection: close This is not the real page </data> +# The second URL will get this response +<data1> +HTTP/1.1 401 Authorization Required swsclose
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Blackmagic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Basic realm="gimme all yer s3cr3ts"
+WWW-Authenticate: Digest realm="gimme all yer s3cr3ts", nonce="11223344"
+Content-Type: text/html; charset=iso-8859-1
+Connection: close
+
+This is not the real page +</data1> + # This is supposed to be returned when the server gets a # Authorization: Digest line passed-in from the client <data1000> @@ -109,6 +122,11 @@ Accept: */* GET /14120001 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
+Accept: */*
+
+GET /14120001 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
Authorization: Digest username="testuser", realm="gimme all yer s3cr3ts", nonce="11223344", uri="/14120001", response="0085df91870374c8bf4e94415e7fbf8e"
User-Agent: curl/7.10.5 (i686-pc-linux-gnu) libcurl/7.10.5 OpenSSL/0.9.7a ipv6 zlib/1.1.3
Accept: */*
diff --git a/tests/data/test1418 b/tests/data/test1418 index b3a2f23b..c137b1c5 100644 --- a/tests/data/test1418 +++ b/tests/data/test1418 @@ -22,6 +22,15 @@ WWW-Authenticate: Basic Please auth with me </data> +<data3> +HTTP/1.1 401 Authentication please!
+Content-Length: 20
+WWW-Authenticate: Digest realm="loonie", nonce="314156592"
+WWW-Authenticate: Basic
+
+Please auth with me +</data3> + # This is supposed to be returned when the server gets the second # Authorization: NTLM line passed-in from the client <data1000> @@ -99,6 +108,10 @@ Accept: */* GET /14180003 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+GET /14180003 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
Authorization: Digest username="testuser", realm="loonie", nonce="314156592", uri="/14180003", response="1c6390a67bac3283a9b023402f3b3540"
Accept: */*
diff --git a/tests/data/test1420 b/tests/data/test1420 index ebd45ff8..03c4584d 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -66,7 +66,6 @@ int main(int argc, char *argv[]) curl_easy_setopt(hnd, CURLOPT_BUFFERSIZE, 102400L); curl_easy_setopt(hnd, CURLOPT_URL, "imap://%HOSTIP:%IMAPPORT/1420/;MAILINDEX=1"); curl_easy_setopt(hnd, CURLOPT_USERPWD, "user:secret"); - curl_easy_setopt(hnd, CURLOPT_HTTP09_ALLOWED, 1L); curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); curl_easy_setopt(hnd, CURLOPT_TCP_KEEPALIVE, 1L); diff --git a/tests/data/test1514 b/tests/data/test1514 index 38f5da61..6c09ae3b 100644 --- a/tests/data/test1514 +++ b/tests/data/test1514 @@ -4,13 +4,14 @@ HTTP HTTP POST Content-Length +chunked Transfer-Encoding </keywords> </info> # Server-side <reply> <data nocheck="yes"> -HTTP/1.1 411 Length Required
+HTTP/1.1 200 OK
Date: Sun, 19 Jan 2014 18:50:58 GMT
Server: test-server/fake swsclose
Connection: close
@@ -36,13 +37,27 @@ http://%HOSTIP:%HTTPPORT/1514 # Verify data after the test has been "shot" <verify> # Content-Length header is not present +# Transfer-Encoding header is added automatically <protocol> POST /1514 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
Accept: */*
+Transfer-Encoding: chunked
Content-Type: application/x-www-form-urlencoded
Expect: 100-continue
+1
+d
+1
+u
+1
+m
+1
+m
+1
+y
+0
+
</protocol> </verify> </testcase> diff --git a/tests/data/test153 b/tests/data/test153 index f679de4e..77f7adb0 100644 --- a/tests/data/test153 +++ b/tests/data/test153 @@ -9,7 +9,7 @@ HTTP Digest auth # Server-side <reply> -# reply back and ask for Digest auth +# First reply back and ask for Digest auth <data1> HTTP/1.1 401 Authorization Required swsclose
Server: Apache/1.3.27 (Darwin) PHP/4.1.2
@@ -20,6 +20,17 @@ Content-Length: 26 This is not the real page </data1> +# second reply back +<data2> +HTTP/1.1 401 Authorization Required swsclose
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 26
+
+This is not the real page +</data2> + # This is supposed to be returned when the server gets a # Authorization: Digest line passed-in from the client <data1001> @@ -93,6 +104,11 @@ Accept: */* GET /1530002 HTTP/1.1
Host: %HOSTIP:%HTTPPORT
+User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
+Accept: */*
+
+GET /1530002 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
Authorization: Digest username="testuser", realm="testrealm", nonce="1053604145", uri="/1530002", response="f84511b014fdd0ba6494f42871079c32"
User-Agent: curl/7.11.0-CVS (i686-pc-linux-gnu) libcurl/7.11.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS
Accept: */*
@@ -117,6 +133,12 @@ Content-Type: text/html; charset=iso-8859-1 Content-Length: 23
This IS the real page! +HTTP/1.1 401 Authorization Required swsclose
+Server: Apache/1.3.27 (Darwin) PHP/4.1.2
+WWW-Authenticate: Digest realm="testrealm", nonce="1053604145"
+Content-Type: text/html; charset=iso-8859-1
+Content-Length: 26
+
HTTP/1.1 401 Authorization re-negotiation please swsbounce
Server: Apache/1.3.27 (Darwin) PHP/4.1.2
WWW-Authenticate: Digest realm="testrealm", algorithm=MD5, nonce="999999", stale=true, qop="auth"
diff --git a/tests/data/test1538 b/tests/data/test1538 index 98d6731e..9374debb 100644 --- a/tests/data/test1538 +++ b/tests/data/test1538 @@ -126,7 +126,8 @@ e90: SSL public key does not match pinned public key e91: SSL server certificate status verification FAILED e92: Stream error in the HTTP/2 framing layer e93: API function called from within callback -e94: Unknown error +e94: An authentication function returned an error +e95: Unknown error m-1: Please call curl_multi_perform() soon m0: No error m1: Invalid multi handle diff --git a/tests/data/test1594 b/tests/data/test1594 new file mode 100644 index 00000000..4907ca2b --- /dev/null +++ b/tests/data/test1594 @@ -0,0 +1,52 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP replaced headers +CURLOPT_TIMECONDITION +If-Modified-Since +</keywords> +</info> + +# Server-side +<reply> +<data nocheck="yes"> +HTTP/1.1 503 Error +Date: Thu, 11 Jul 2019 02:26:59 GMT +Server: test-server/swsclose +Retry-After: 22 + +</data> +</reply> +# Client-side +<client> +<server> +http +</server> +<name> +HTTP Retry-After header parsing and extraction +</name> +<tool> +lib1594 +</tool> +<command> +http://%HOSTIP:%HTTPPORT/1594 +</command> +</client> + +<verify> +<strip> +^User-Agent:.* +</strip> +<protocol> +GET /1594 HTTP/1.1
+Host: %HOSTIP:%HTTPPORT
+Accept: */*
+
+</protocol> +<stdout> +Retry-After: 22 +</stdout> +</verify> +</testcase> diff --git a/tests/data/test1654 b/tests/data/test1654 index 175076c8..5b32cb41 100644 --- a/tests/data/test1654 +++ b/tests/data/test1654 @@ -32,7 +32,7 @@ unit1654 <file name="log/1654" mode="text"> h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 # a comment -h2c example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 +h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 h1 example.com 443 h3 shiny.example.com 8443 "20121231 00:00:01" 0 1 h3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 1 # also a comment @@ -45,14 +45,14 @@ rubbish # Your alt-svc cache. https://curl.haxx.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 -h2c example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 +h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 h1 example.com 443 h3 shiny.example.com 8443 "20121231 00:00:01" 0 1 h3 example.com 443 h3 shiny.example.com 8443 "20131231 00:00:00" 0 1 h1 example.org 8080 h2 example.com 8080 "20190125 22:34:21" 0 0 h1 2.example.org 8080 h3 2.example.org 8080 "20190125 22:34:21" 0 0 h1 3.example.org 8080 h2 example.com 8080 "20190125 22:34:21" 0 0 h1 3.example.org 8080 h3 yesyes.com 8080 "20190125 22:34:21" 0 0 -h2c example.org 80 h2 example.com 443 "20190124 22:36:21" 0 0 +h2 example.org 80 h2 example.com 443 "20190124 22:36:21" 0 0 </file> </verify> </testcase> diff --git a/tests/data/test2006 b/tests/data/test2006 index 3acbdaee..4d08e0aa 100644 --- a/tests/data/test2006 +++ b/tests/data/test2006 @@ -86,10 +86,6 @@ Accept: */* Some data delivered from an HTTP resource </file1> <file2 name="log/heads2006"> -Content-Length: 496
-Accept-ranges: bytes
- -
HTTP/1.1 200 OK Date: Thu, 21 Jun 2012 14:49:01 GMT Server: test-server/fake diff --git a/tests/data/test2007 b/tests/data/test2007 index b169c490..bb4d5cde 100644 --- a/tests/data/test2007 +++ b/tests/data/test2007 @@ -90,10 +90,6 @@ Something delivered from an HTTP resource s/Last-Modified:.*// </stripfile2> <file2 name="log/heads2007"> -Content-Length: 496
-Accept-ranges: bytes
- -
HTTP/1.1 200 OK Date: Thu, 21 Jun 2012 14:50:02 GMT Server: test-server/fake diff --git a/tests/data/test2008 b/tests/data/test2008 index 012f221c..d6bbf6b4 100644 --- a/tests/data/test2008 +++ b/tests/data/test2008 @@ -82,10 +82,6 @@ Some stuff delivered from an HTTP resource s/Last-Modified:.*// </stripfile2> <file2 name="log/heads2008"> -Content-Length: 496
-Accept-ranges: bytes
- -
HTTP/1.1 200 OK Date: Thu, 21 Jun 2012 15:23:48 GMT Server: test-server/fake diff --git a/tests/data/test2009 b/tests/data/test2009 index b0e5c6c6..1a933585 100644 --- a/tests/data/test2009 +++ b/tests/data/test2009 @@ -83,10 +83,6 @@ Some contents delivered from an HTTP resource s/Last-Modified:.*// </stripfile2> <file2 name="log/heads2009"> -Content-Length: 496
-Accept-ranges: bytes
- -
HTTP/1.1 200 OK Date: Thu, 21 Jun 2012 16:27:17 GMT Server: test-server/fake diff --git a/tests/data/test2010 b/tests/data/test2010 index 33bb309e..1f5320fe 100644 --- a/tests/data/test2010 +++ b/tests/data/test2010 @@ -82,10 +82,6 @@ Contents delivered from an HTTP resource s/Last-Modified:.*// </stripfile2> <file2 name="log/heads2010"> -Content-Length: 496
-Accept-ranges: bytes
- -
HTTP/1.1 200 OK Date: Thu, 21 Jun 2012 17:37:27 GMT Server: test-server/fake diff --git a/tests/data/test2047 b/tests/data/test2047 index fc140486..bc735097 100644 --- a/tests/data/test2047 +++ b/tests/data/test2047 @@ -92,7 +92,7 @@ OK 1 1 3 -http://xn--4cab6c.se/20470001 +http://åäö.se/20470001 text/plain; charset=us-ascii 200 </stdout> diff --git a/tests/data/test2077 b/tests/data/test2077 new file mode 100644 index 00000000..0c600f5c --- /dev/null +++ b/tests/data/test2077 @@ -0,0 +1,42 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +GSS-API +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK swsclose
+Content-Length: 23
+
+This IS the real page! +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<features> +GSS-API +</features> +<name> +curl --fail --negotiate to unauthenticated service fails +</name> +<command> +http://%HOSTIP:%HTTPPORT/2077 -u : --fail --negotiate +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<errorcode> +0 +</errorcode> +</verify> +</testcase> diff --git a/tests/data/test2078 b/tests/data/test2078 new file mode 100644 index 00000000..99bc2dbe --- /dev/null +++ b/tests/data/test2078 @@ -0,0 +1,54 @@ +<testcase> +<info> +<keywords> +HTTP +HTTP GET +GSS-API +</keywords> +</info> + +# Server-side +<reply> +<data> +HTTP/1.1 200 OK swsclose
+Content-Length: 23
+
+This IS the real page! +</data> +</reply> + +# Client-side +<client> +<server> +http +</server> +<features> +GSS-API +</features> +<name> +curl --negotiate should not send empty POST request only +</name> +<command> +http://%HOSTIP:%HTTPPORT/2078 -u : --negotiate --data name=value +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<errorcode> +0 +</errorcode> +<strip> +^User-Agent:.* +</strip> +<protocol nonewline="yes"> +POST /2078 HTTP/1.1
+Host: 127.0.0.1:8990
+Accept: */*
+Content-Length: 10
+Content-Type: application/x-www-form-urlencoded
+
+name=value +</protocol> +</verify> +</testcase> diff --git a/tests/data/test335 b/tests/data/test335 new file mode 100644 index 00000000..4d54da98 --- /dev/null +++ b/tests/data/test335 @@ -0,0 +1,102 @@ +# Mostly a duplicate of test168 +<testcase> +<info> +<keywords> +HTTP +HTTP GET +HTTP proxy +HTTP proxy Digest auth +HTTP Digest auth +HTTP auth in URL +</keywords> +</info> + +# Server-side +<reply> + +# this is returned first since we get no proxy-auth +<data> +HTTP/1.1 407 Authorization Required to proxy me my dear swsclose +Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345" + +And you should ignore this data. +</data> + +# then this is returned since we get no server-auth +<data1000> +HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose +WWW-Authenticate: Digest realm="realmweirdo", nonce="123456" + +you should ignore this data too +</data1000> + +<data1001> +HTTP/1.1 200 OK swsclose +Server: no +Content-Length: 15 + +Nice auth sir! +</data1001> + +<datacheck> +HTTP/1.1 407 Authorization Required to proxy me my dear swsclose +Proxy-Authenticate: Digest realm="weirdorealm", nonce="12345" + +HTTP/1.1 401 Authorization to the remote host as well swsbounce swsclose +WWW-Authenticate: Digest realm="realmweirdo", nonce="123456" + +HTTP/1.1 200 OK swsclose +Server: no +Content-Length: 15 + +Nice auth sir! +</datacheck> +</reply> + +# Client-side +<client> +<server> +http +</server> +<features> +!SSPI +crypto +</features> + <name> +HTTP with proxy Digest and site Digest with creds in URLs + </name> + <command> +http://digest:alot@data.from.server.requiring.digest.hohoho.com/335 --proxy http://foo:bar@%HOSTIP:%HTTPPORT --proxy-digest --digest +</command> +</client> + +# Verify data after the test has been "shot" +<verify> +<strip> +^User-Agent: curl/.* +</strip> +<protocol> +GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
+User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b zlib/1.1.4 c-ares/1.2.0 libidn/0.4.3
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+GET http://data.from.server.requiring.digest.hohoho.com/335 HTTP/1.1
+Host: data.from.server.requiring.digest.hohoho.com
+Proxy-Authorization: Digest username="foo", realm="weirdorealm", nonce="12345", uri="/335", response="f61609cd8f5bb205ef4e169b2c5626cb"
+Authorization: Digest username="digest", realm="realmweirdo", nonce="123456", uri="/335", response="08a2e2e684047f4219a38ddc189ac00c"
+User-Agent: curl/7.12.0-CVS (i686-pc-linux-gnu) libcurl/7.12.0-CVS OpenSSL/0.9.6b ipv6 zlib/1.1.4 GSS libidn/0.4.3
+Accept: */*
+Proxy-Connection: Keep-Alive
+
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test356 b/tests/data/test356 index e2ac4860..1be05fe6 100644 --- a/tests/data/test356 +++ b/tests/data/test356 @@ -16,7 +16,7 @@ Content-Length: 6 Connection: close Content-Type: text/html Funny-head: yesyes -Alt-Svc: h1="nowhere.foo:81" +Alt-Svc: h1="nowhere.foo:81", un-kno22!wn=":82" -foo- </data> diff --git a/tests/data/test848 b/tests/data/test848 new file mode 100644 index 00000000..2b4a30b2 --- /dev/null +++ b/tests/data/test848 @@ -0,0 +1,56 @@ +<testcase> +<info> +<keywords> +IMAP +SASL +SASL AUTH PLAIN +RFC4616 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTHENTICATE + +REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= A002 OK AUTHENTICATE completed +</servercmd> +<data> +From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+</data> +</reply> + +# +# Client-side +<client> +<server> +imap +</server> + <name> +IMAP plain authentication with alternative authorization identity + </name> + <command> +'imap://%HOSTIP:%IMAPPORT/848/;MAILINDEX=1' -u user:secret --sasl-authzid shared-mailbox +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+A003 SELECT 848
+A004 FETCH 1 BODY[]
+A005 LOGOUT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test849 b/tests/data/test849 new file mode 100644 index 00000000..8a4b39c0 --- /dev/null +++ b/tests/data/test849 @@ -0,0 +1,51 @@ +<testcase> +<info> +<keywords> +IMAP +SASL +SASL AUTH PLAIN +RFC4616 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTHENTICATE + +REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= A002 NO Not authorized +</servercmd> +</reply> + +# +# Client-side +<client> +<server> +imap +</server> + <name> +IMAP plain authentication with alternative authorization identity (Not authorized) + </name> + <command> +'imap://%HOSTIP:%IMAPPORT/849/;MAILINDEX=1' -u kurt:xipj3plmq --sasl-authzid ursel +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +# 67 - CURLE_LOGIN_DENIED +<errorcode> +67 +</errorcode> +# +# The multi interface considers a broken "CONNECT" as a prematurely broken +# transfer and such a connection will not get a "LOGOUT" +<protocol> +A001 CAPABILITY
+A002 AUTHENTICATE PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test892 b/tests/data/test892 new file mode 100644 index 00000000..4b831829 --- /dev/null +++ b/tests/data/test892 @@ -0,0 +1,57 @@ +<testcase> +<info> +<keywords> +POP3 +SASL +SASL AUTH PLAIN +RFC1734 +RFC4616 +RFC5034 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTH + +REPLY c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ= +OK Login successful +</servercmd> +<data> +From: me@somewhere
+To: fake@nowhere
+
+body
+
+--
+ yours sincerely
+</data> +</reply> + +# +# Client-side +<client> +<server> +pop3 +</server> + <name> +POP3 plain authentication with alternative authorization identity + </name> + <command> +pop3://%HOSTIP:%POP3PORT/892 -u user:secret --sasl-authzid shared-mailbox +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +CAPA
+AUTH PLAIN
+c2hhcmVkLW1haWxib3gAdXNlcgBzZWNyZXQ=
+RETR 892
+QUIT
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test893 b/tests/data/test893 new file mode 100644 index 00000000..2a762fc2 --- /dev/null +++ b/tests/data/test893 @@ -0,0 +1,53 @@ +<testcase> +<info> +<keywords> +POP3 +SASL +SASL AUTH PLAIN +RFC1734 +RFC4616 +RFC5034 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTH + +REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= -ERR Not authorized +</servercmd> +</reply> + +# +# Client-side +<client> +<server> +pop3 +</server> + <name> +POP3 plain authentication with alternative authorization identity (Not authorized) + </name> + <command> +pop3://%HOSTIP:%POP3PORT/893 -u kurt:xipj3plmq --sasl-authzid ursel +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +# 67 - CURLE_LOGIN_DENIED +<errorcode> +67 +</errorcode> +# +# The multi interface considers a broken "CONNECT" as a prematurely broken +# transfer and such a connection will not get a "QUIT" +<protocol> +CAPA
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+</protocol> +</verify> +</testcase> diff --git a/tests/data/test953 b/tests/data/test953 new file mode 100644 index 00000000..4a70e1f3 --- /dev/null +++ b/tests/data/test953 @@ -0,0 +1,56 @@ +<testcase> +<info> +<keywords> +SMTP +SASL +SASL AUTH PLAIN +RFC4616 +RFC4954 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTH 334 PLAIN supported +REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 235 Authenticated +</servercmd> +</reply> + +# +# Client-side +<client> +<server> +smtp +</server> + <name> +SMTP plain authentication with alternative authorization identity + </name> +<stdin> +mail body
+</stdin> + <command> +smtp://%HOSTIP:%SMTPPORT/953 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +<protocol> +EHLO 953
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+MAIL FROM:<sender@example.com>
+RCPT TO:<recipient@example.com>
+DATA
+QUIT
+</protocol> +<upload> +mail body
+.
+</upload> +</verify> +</testcase> diff --git a/tests/data/test954 b/tests/data/test954 new file mode 100644 index 00000000..a5e6bb0d --- /dev/null +++ b/tests/data/test954 @@ -0,0 +1,55 @@ +<testcase> +<info> +<keywords> +SMTP +SASL +SASL AUTH PLAIN +RFC4616 +RFC4954 +</keywords> +</info> + +# +# Server-side +<reply> +<servercmd> +AUTH PLAIN +REPLY AUTH 334 PLAIN supported +REPLY dXJzZWwAa3VydAB4aXBqM3BsbXE= 501 Not authorized +</servercmd> +</reply> + +# +# Client-side +<client> +<server> +smtp +</server> + <name> +SMTP plain authentication with alternative authorization identity (Not authorized) + </name> +<stdin> +mail body +</stdin> + <command> +smtp://%HOSTIP:%SMTPPORT/954 --mail-rcpt recipient@example.com --mail-from sender@example.com -u kurt:xipj3plmq --sasl-authzid ursel -T - +</command> +</client> + +# +# Verify data after the test has been "shot" +<verify> +# 67 - CURLE_LOGIN_DENIED +<errorcode> +67 +</errorcode> +# +# The multi interface considers a broken "CONNECT" as a prematurely broken +# transfer and such a connection will not get a "QUIT" +<protocol> +EHLO 954
+AUTH PLAIN
+dXJzZWwAa3VydAB4aXBqM3BsbXE=
+</protocol> +</verify> +</testcase> diff --git a/tests/libtest/Makefile.in b/tests/libtest/Makefile.in index 6e4b3c53..456e67f2 100644 --- a/tests/libtest/Makefile.in +++ b/tests/libtest/Makefile.in @@ -138,8 +138,9 @@ noinst_PROGRAMS = chkhostname$(EXEEXT) libauthretry$(EXEEXT) \ lib1554$(EXEEXT) lib1555$(EXEEXT) lib1556$(EXEEXT) \ lib1557$(EXEEXT) lib1558$(EXEEXT) lib1559$(EXEEXT) \ lib1560$(EXEEXT) lib1591$(EXEEXT) lib1592$(EXEEXT) \ - lib1593$(EXEEXT) lib1900$(EXEEXT) lib1905$(EXEEXT) \ - lib1906$(EXEEXT) lib2033$(EXEEXT) + lib1593$(EXEEXT) lib1594$(EXEEXT) lib1596$(EXEEXT) \ + lib1900$(EXEEXT) lib1905$(EXEEXT) lib1906$(EXEEXT) \ + lib2033$(EXEEXT) @USE_CPPFLAG_CURL_STATICLIB_TRUE@am__append_1 = -DCURL_STATICLIB @CURL_LT_SHLIB_USE_NO_UNDEFINED_TRUE@am__append_2 = -no-undefined @CURL_LT_SHLIB_USE_MIMPURE_TEXT_TRUE@am__append_3 = -mimpure-text @@ -553,549 +554,560 @@ am_lib1593_OBJECTS = lib1593.$(OBJEXT) $(am__objects_121) \ $(am__objects_122) $(am__objects_123) lib1593_OBJECTS = $(am_lib1593_OBJECTS) lib1593_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_130 = lib1900-first.$(OBJEXT) -am__objects_131 = lib1900-testutil.$(OBJEXT) -am__objects_132 = ../../lib/lib1900-warnless.$(OBJEXT) -am_lib1900_OBJECTS = lib1900-lib1900.$(OBJEXT) $(am__objects_130) \ +am_lib1594_OBJECTS = lib1594.$(OBJEXT) $(am__objects_121) \ + $(am__objects_122) $(am__objects_123) +lib1594_OBJECTS = $(am_lib1594_OBJECTS) +lib1594_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_130 = lib1596-first.$(OBJEXT) +am__objects_131 = lib1596-testutil.$(OBJEXT) +am__objects_132 = ../../lib/lib1596-warnless.$(OBJEXT) +am_lib1596_OBJECTS = lib1596-lib1594.$(OBJEXT) $(am__objects_130) \ $(am__objects_131) $(am__objects_132) +lib1596_OBJECTS = $(am_lib1596_OBJECTS) +lib1596_DEPENDENCIES = $(am__DEPENDENCIES_1) +am__objects_133 = lib1900-first.$(OBJEXT) +am__objects_134 = lib1900-testutil.$(OBJEXT) +am__objects_135 = ../../lib/lib1900-warnless.$(OBJEXT) +am_lib1900_OBJECTS = lib1900-lib1900.$(OBJEXT) $(am__objects_133) \ + $(am__objects_134) $(am__objects_135) lib1900_OBJECTS = $(am_lib1900_OBJECTS) lib1900_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_133 = lib1905-first.$(OBJEXT) -am__objects_134 = lib1905-testutil.$(OBJEXT) -am__objects_135 = ../../lib/lib1905-warnless.$(OBJEXT) -am_lib1905_OBJECTS = lib1905-lib1905.$(OBJEXT) $(am__objects_133) \ - $(am__objects_134) $(am__objects_135) +am__objects_136 = lib1905-first.$(OBJEXT) +am__objects_137 = lib1905-testutil.$(OBJEXT) +am__objects_138 = ../../lib/lib1905-warnless.$(OBJEXT) +am_lib1905_OBJECTS = lib1905-lib1905.$(OBJEXT) $(am__objects_136) \ + $(am__objects_137) $(am__objects_138) lib1905_OBJECTS = $(am_lib1905_OBJECTS) lib1905_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_136 = lib1906-first.$(OBJEXT) -am__objects_137 = lib1906-testutil.$(OBJEXT) -am__objects_138 = ../../lib/lib1906-warnless.$(OBJEXT) -am_lib1906_OBJECTS = lib1906-lib1906.$(OBJEXT) $(am__objects_136) \ - $(am__objects_137) $(am__objects_138) +am__objects_139 = lib1906-first.$(OBJEXT) +am__objects_140 = lib1906-testutil.$(OBJEXT) +am__objects_141 = ../../lib/lib1906-warnless.$(OBJEXT) +am_lib1906_OBJECTS = lib1906-lib1906.$(OBJEXT) $(am__objects_139) \ + $(am__objects_140) $(am__objects_141) lib1906_OBJECTS = $(am_lib1906_OBJECTS) lib1906_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_139 = lib2033-first.$(OBJEXT) -am__objects_140 = lib2033-testutil.$(OBJEXT) -am__objects_141 = ../../lib/lib2033-warnless.$(OBJEXT) +am__objects_142 = lib2033-first.$(OBJEXT) +am__objects_143 = lib2033-testutil.$(OBJEXT) +am__objects_144 = ../../lib/lib2033-warnless.$(OBJEXT) am_lib2033_OBJECTS = lib2033-libntlmconnect.$(OBJEXT) \ - $(am__objects_139) $(am__objects_140) $(am__objects_141) + $(am__objects_142) $(am__objects_143) $(am__objects_144) lib2033_OBJECTS = $(am_lib2033_OBJECTS) lib2033_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_142 = lib500-first.$(OBJEXT) -am__objects_143 = lib500-testutil.$(OBJEXT) -am__objects_144 = lib500-testtrace.$(OBJEXT) -am_lib500_OBJECTS = lib500-lib500.$(OBJEXT) $(am__objects_142) \ - $(am__objects_143) $(am__objects_144) +am__objects_145 = lib500-first.$(OBJEXT) +am__objects_146 = lib500-testutil.$(OBJEXT) +am__objects_147 = lib500-testtrace.$(OBJEXT) +am_lib500_OBJECTS = lib500-lib500.$(OBJEXT) $(am__objects_145) \ + $(am__objects_146) $(am__objects_147) lib500_OBJECTS = $(am_lib500_OBJECTS) lib500_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_145 = lib501-first.$(OBJEXT) -am_lib501_OBJECTS = lib501-lib501.$(OBJEXT) $(am__objects_145) +am__objects_148 = lib501-first.$(OBJEXT) +am_lib501_OBJECTS = lib501-lib501.$(OBJEXT) $(am__objects_148) lib501_OBJECTS = $(am_lib501_OBJECTS) lib501_LDADD = $(LDADD) lib501_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_146 = lib502-first.$(OBJEXT) -am__objects_147 = lib502-testutil.$(OBJEXT) -am__objects_148 = ../../lib/lib502-warnless.$(OBJEXT) -am_lib502_OBJECTS = lib502-lib502.$(OBJEXT) $(am__objects_146) \ - $(am__objects_147) $(am__objects_148) +am__objects_149 = lib502-first.$(OBJEXT) +am__objects_150 = lib502-testutil.$(OBJEXT) +am__objects_151 = ../../lib/lib502-warnless.$(OBJEXT) +am_lib502_OBJECTS = lib502-lib502.$(OBJEXT) $(am__objects_149) \ + $(am__objects_150) $(am__objects_151) lib502_OBJECTS = $(am_lib502_OBJECTS) lib502_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_149 = lib503-first.$(OBJEXT) -am__objects_150 = lib503-testutil.$(OBJEXT) -am__objects_151 = ../../lib/lib503-warnless.$(OBJEXT) -am_lib503_OBJECTS = lib503-lib503.$(OBJEXT) $(am__objects_149) \ - $(am__objects_150) $(am__objects_151) +am__objects_152 = lib503-first.$(OBJEXT) +am__objects_153 = lib503-testutil.$(OBJEXT) +am__objects_154 = ../../lib/lib503-warnless.$(OBJEXT) +am_lib503_OBJECTS = lib503-lib503.$(OBJEXT) $(am__objects_152) \ + $(am__objects_153) $(am__objects_154) lib503_OBJECTS = $(am_lib503_OBJECTS) lib503_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_152 = lib504-first.$(OBJEXT) -am__objects_153 = lib504-testutil.$(OBJEXT) -am__objects_154 = ../../lib/lib504-warnless.$(OBJEXT) -am_lib504_OBJECTS = lib504-lib504.$(OBJEXT) $(am__objects_152) \ - $(am__objects_153) $(am__objects_154) +am__objects_155 = lib504-first.$(OBJEXT) +am__objects_156 = lib504-testutil.$(OBJEXT) +am__objects_157 = ../../lib/lib504-warnless.$(OBJEXT) +am_lib504_OBJECTS = lib504-lib504.$(OBJEXT) $(am__objects_155) \ + $(am__objects_156) $(am__objects_157) lib504_OBJECTS = $(am_lib504_OBJECTS) lib504_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_155 = lib505-first.$(OBJEXT) -am_lib505_OBJECTS = lib505-lib505.$(OBJEXT) $(am__objects_155) +am__objects_158 = lib505-first.$(OBJEXT) +am_lib505_OBJECTS = lib505-lib505.$(OBJEXT) $(am__objects_158) lib505_OBJECTS = $(am_lib505_OBJECTS) lib505_LDADD = $(LDADD) lib505_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_156 = lib506-first.$(OBJEXT) -am_lib506_OBJECTS = lib506-lib506.$(OBJEXT) $(am__objects_156) +am__objects_159 = lib506-first.$(OBJEXT) +am_lib506_OBJECTS = lib506-lib506.$(OBJEXT) $(am__objects_159) lib506_OBJECTS = $(am_lib506_OBJECTS) lib506_LDADD = $(LDADD) lib506_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_157 = lib507-first.$(OBJEXT) -am__objects_158 = lib507-testutil.$(OBJEXT) -am__objects_159 = ../../lib/lib507-warnless.$(OBJEXT) -am_lib507_OBJECTS = lib507-lib507.$(OBJEXT) $(am__objects_157) \ - $(am__objects_158) $(am__objects_159) +am__objects_160 = lib507-first.$(OBJEXT) +am__objects_161 = lib507-testutil.$(OBJEXT) +am__objects_162 = ../../lib/lib507-warnless.$(OBJEXT) +am_lib507_OBJECTS = lib507-lib507.$(OBJEXT) $(am__objects_160) \ + $(am__objects_161) $(am__objects_162) lib507_OBJECTS = $(am_lib507_OBJECTS) lib507_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_160 = lib508-first.$(OBJEXT) -am_lib508_OBJECTS = lib508-lib508.$(OBJEXT) $(am__objects_160) +am__objects_163 = lib508-first.$(OBJEXT) +am_lib508_OBJECTS = lib508-lib508.$(OBJEXT) $(am__objects_163) lib508_OBJECTS = $(am_lib508_OBJECTS) lib508_LDADD = $(LDADD) lib508_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_161 = lib509-first.$(OBJEXT) -am_lib509_OBJECTS = lib509-lib509.$(OBJEXT) $(am__objects_161) +am__objects_164 = lib509-first.$(OBJEXT) +am_lib509_OBJECTS = lib509-lib509.$(OBJEXT) $(am__objects_164) lib509_OBJECTS = $(am_lib509_OBJECTS) lib509_LDADD = $(LDADD) lib509_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_162 = lib510-first.$(OBJEXT) -am_lib510_OBJECTS = lib510-lib510.$(OBJEXT) $(am__objects_162) +am__objects_165 = lib510-first.$(OBJEXT) +am_lib510_OBJECTS = lib510-lib510.$(OBJEXT) $(am__objects_165) lib510_OBJECTS = $(am_lib510_OBJECTS) lib510_LDADD = $(LDADD) lib510_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_163 = lib511-first.$(OBJEXT) -am_lib511_OBJECTS = lib511-lib511.$(OBJEXT) $(am__objects_163) +am__objects_166 = lib511-first.$(OBJEXT) +am_lib511_OBJECTS = lib511-lib511.$(OBJEXT) $(am__objects_166) lib511_OBJECTS = $(am_lib511_OBJECTS) lib511_LDADD = $(LDADD) lib511_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_164 = lib512-first.$(OBJEXT) -am_lib512_OBJECTS = lib512-lib512.$(OBJEXT) $(am__objects_164) +am__objects_167 = lib512-first.$(OBJEXT) +am_lib512_OBJECTS = lib512-lib512.$(OBJEXT) $(am__objects_167) lib512_OBJECTS = $(am_lib512_OBJECTS) lib512_LDADD = $(LDADD) lib512_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_165 = lib513-first.$(OBJEXT) -am_lib513_OBJECTS = lib513-lib513.$(OBJEXT) $(am__objects_165) +am__objects_168 = lib513-first.$(OBJEXT) +am_lib513_OBJECTS = lib513-lib513.$(OBJEXT) $(am__objects_168) lib513_OBJECTS = $(am_lib513_OBJECTS) lib513_LDADD = $(LDADD) lib513_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_166 = lib514-first.$(OBJEXT) -am_lib514_OBJECTS = lib514-lib514.$(OBJEXT) $(am__objects_166) +am__objects_169 = lib514-first.$(OBJEXT) +am_lib514_OBJECTS = lib514-lib514.$(OBJEXT) $(am__objects_169) lib514_OBJECTS = $(am_lib514_OBJECTS) lib514_LDADD = $(LDADD) lib514_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_167 = lib515-first.$(OBJEXT) -am_lib515_OBJECTS = lib515-lib515.$(OBJEXT) $(am__objects_167) +am__objects_170 = lib515-first.$(OBJEXT) +am_lib515_OBJECTS = lib515-lib515.$(OBJEXT) $(am__objects_170) lib515_OBJECTS = $(am_lib515_OBJECTS) lib515_LDADD = $(LDADD) lib515_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_168 = lib516-first.$(OBJEXT) -am_lib516_OBJECTS = lib516-lib516.$(OBJEXT) $(am__objects_168) +am__objects_171 = lib516-first.$(OBJEXT) +am_lib516_OBJECTS = lib516-lib516.$(OBJEXT) $(am__objects_171) lib516_OBJECTS = $(am_lib516_OBJECTS) lib516_LDADD = $(LDADD) lib516_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_169 = lib517-first.$(OBJEXT) -am_lib517_OBJECTS = lib517-lib517.$(OBJEXT) $(am__objects_169) +am__objects_172 = lib517-first.$(OBJEXT) +am_lib517_OBJECTS = lib517-lib517.$(OBJEXT) $(am__objects_172) lib517_OBJECTS = $(am_lib517_OBJECTS) lib517_LDADD = $(LDADD) lib517_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_170 = lib518-first.$(OBJEXT) -am__objects_171 = ../../lib/lib518-warnless.$(OBJEXT) -am_lib518_OBJECTS = lib518-lib518.$(OBJEXT) $(am__objects_170) \ - $(am__objects_171) +am__objects_173 = lib518-first.$(OBJEXT) +am__objects_174 = ../../lib/lib518-warnless.$(OBJEXT) +am_lib518_OBJECTS = lib518-lib518.$(OBJEXT) $(am__objects_173) \ + $(am__objects_174) lib518_OBJECTS = $(am_lib518_OBJECTS) lib518_LDADD = $(LDADD) lib518_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_172 = lib519-first.$(OBJEXT) -am_lib519_OBJECTS = lib519-lib519.$(OBJEXT) $(am__objects_172) +am__objects_175 = lib519-first.$(OBJEXT) +am_lib519_OBJECTS = lib519-lib519.$(OBJEXT) $(am__objects_175) lib519_OBJECTS = $(am_lib519_OBJECTS) lib519_LDADD = $(LDADD) lib519_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_173 = lib520-first.$(OBJEXT) -am_lib520_OBJECTS = lib520-lib520.$(OBJEXT) $(am__objects_173) +am__objects_176 = lib520-first.$(OBJEXT) +am_lib520_OBJECTS = lib520-lib520.$(OBJEXT) $(am__objects_176) lib520_OBJECTS = $(am_lib520_OBJECTS) lib520_LDADD = $(LDADD) lib520_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_174 = lib521-first.$(OBJEXT) -am_lib521_OBJECTS = lib521-lib521.$(OBJEXT) $(am__objects_174) +am__objects_177 = lib521-first.$(OBJEXT) +am_lib521_OBJECTS = lib521-lib521.$(OBJEXT) $(am__objects_177) lib521_OBJECTS = $(am_lib521_OBJECTS) lib521_LDADD = $(LDADD) lib521_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_175 = lib523-first.$(OBJEXT) -am_lib523_OBJECTS = lib523-lib523.$(OBJEXT) $(am__objects_175) +am__objects_178 = lib523-first.$(OBJEXT) +am_lib523_OBJECTS = lib523-lib523.$(OBJEXT) $(am__objects_178) lib523_OBJECTS = $(am_lib523_OBJECTS) lib523_LDADD = $(LDADD) lib523_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_176 = lib524-first.$(OBJEXT) -am_lib524_OBJECTS = lib524-lib524.$(OBJEXT) $(am__objects_176) +am__objects_179 = lib524-first.$(OBJEXT) +am_lib524_OBJECTS = lib524-lib524.$(OBJEXT) $(am__objects_179) lib524_OBJECTS = $(am_lib524_OBJECTS) lib524_LDADD = $(LDADD) lib524_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_177 = lib525-first.$(OBJEXT) -am__objects_178 = lib525-testutil.$(OBJEXT) -am__objects_179 = ../../lib/lib525-warnless.$(OBJEXT) -am_lib525_OBJECTS = lib525-lib525.$(OBJEXT) $(am__objects_177) \ - $(am__objects_178) $(am__objects_179) +am__objects_180 = lib525-first.$(OBJEXT) +am__objects_181 = lib525-testutil.$(OBJEXT) +am__objects_182 = ../../lib/lib525-warnless.$(OBJEXT) +am_lib525_OBJECTS = lib525-lib525.$(OBJEXT) $(am__objects_180) \ + $(am__objects_181) $(am__objects_182) lib525_OBJECTS = $(am_lib525_OBJECTS) lib525_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_180 = lib526-first.$(OBJEXT) -am__objects_181 = lib526-testutil.$(OBJEXT) -am__objects_182 = ../../lib/lib526-warnless.$(OBJEXT) -am_lib526_OBJECTS = lib526-lib526.$(OBJEXT) $(am__objects_180) \ - $(am__objects_181) $(am__objects_182) +am__objects_183 = lib526-first.$(OBJEXT) +am__objects_184 = lib526-testutil.$(OBJEXT) +am__objects_185 = ../../lib/lib526-warnless.$(OBJEXT) +am_lib526_OBJECTS = lib526-lib526.$(OBJEXT) $(am__objects_183) \ + $(am__objects_184) $(am__objects_185) lib526_OBJECTS = $(am_lib526_OBJECTS) lib526_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_183 = lib527-first.$(OBJEXT) -am__objects_184 = lib527-testutil.$(OBJEXT) -am__objects_185 = ../../lib/lib527-warnless.$(OBJEXT) -am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_183) \ - $(am__objects_184) $(am__objects_185) +am__objects_186 = lib527-first.$(OBJEXT) +am__objects_187 = lib527-testutil.$(OBJEXT) +am__objects_188 = ../../lib/lib527-warnless.$(OBJEXT) +am_lib527_OBJECTS = lib527-lib526.$(OBJEXT) $(am__objects_186) \ + $(am__objects_187) $(am__objects_188) lib527_OBJECTS = $(am_lib527_OBJECTS) lib527_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_186 = lib529-first.$(OBJEXT) -am__objects_187 = lib529-testutil.$(OBJEXT) -am__objects_188 = ../../lib/lib529-warnless.$(OBJEXT) -am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_186) \ - $(am__objects_187) $(am__objects_188) +am__objects_189 = lib529-first.$(OBJEXT) +am__objects_190 = lib529-testutil.$(OBJEXT) +am__objects_191 = ../../lib/lib529-warnless.$(OBJEXT) +am_lib529_OBJECTS = lib529-lib525.$(OBJEXT) $(am__objects_189) \ + $(am__objects_190) $(am__objects_191) lib529_OBJECTS = $(am_lib529_OBJECTS) lib529_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_189 = lib530-first.$(OBJEXT) -am__objects_190 = lib530-testutil.$(OBJEXT) -am__objects_191 = ../../lib/lib530-warnless.$(OBJEXT) -am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_189) \ - $(am__objects_190) $(am__objects_191) +am__objects_192 = lib530-first.$(OBJEXT) +am__objects_193 = lib530-testutil.$(OBJEXT) +am__objects_194 = ../../lib/lib530-warnless.$(OBJEXT) +am_lib530_OBJECTS = lib530-lib530.$(OBJEXT) $(am__objects_192) \ + $(am__objects_193) $(am__objects_194) lib530_OBJECTS = $(am_lib530_OBJECTS) lib530_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_192 = lib532-first.$(OBJEXT) -am__objects_193 = lib532-testutil.$(OBJEXT) -am__objects_194 = ../../lib/lib532-warnless.$(OBJEXT) -am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_192) \ - $(am__objects_193) $(am__objects_194) +am__objects_195 = lib532-first.$(OBJEXT) +am__objects_196 = lib532-testutil.$(OBJEXT) +am__objects_197 = ../../lib/lib532-warnless.$(OBJEXT) +am_lib532_OBJECTS = lib532-lib526.$(OBJEXT) $(am__objects_195) \ + $(am__objects_196) $(am__objects_197) lib532_OBJECTS = $(am_lib532_OBJECTS) lib532_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_195 = lib533-first.$(OBJEXT) -am__objects_196 = lib533-testutil.$(OBJEXT) -am__objects_197 = ../../lib/lib533-warnless.$(OBJEXT) -am_lib533_OBJECTS = lib533-lib533.$(OBJEXT) $(am__objects_195) \ - $(am__objects_196) $(am__objects_197) +am__objects_198 = lib533-first.$(OBJEXT) +am__objects_199 = lib533-testutil.$(OBJEXT) +am__objects_200 = ../../lib/lib533-warnless.$(OBJEXT) +am_lib533_OBJECTS = lib533-lib533.$(OBJEXT) $(am__objects_198) \ + $(am__objects_199) $(am__objects_200) lib533_OBJECTS = $(am_lib533_OBJECTS) lib533_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_198 = lib537-first.$(OBJEXT) -am__objects_199 = ../../lib/lib537-warnless.$(OBJEXT) -am_lib537_OBJECTS = lib537-lib537.$(OBJEXT) $(am__objects_198) \ - $(am__objects_199) +am__objects_201 = lib537-first.$(OBJEXT) +am__objects_202 = ../../lib/lib537-warnless.$(OBJEXT) +am_lib537_OBJECTS = lib537-lib537.$(OBJEXT) $(am__objects_201) \ + $(am__objects_202) lib537_OBJECTS = $(am_lib537_OBJECTS) lib537_LDADD = $(LDADD) lib537_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_200 = lib539-first.$(OBJEXT) -am_lib539_OBJECTS = lib539-lib539.$(OBJEXT) $(am__objects_200) +am__objects_203 = lib539-first.$(OBJEXT) +am_lib539_OBJECTS = lib539-lib539.$(OBJEXT) $(am__objects_203) lib539_OBJECTS = $(am_lib539_OBJECTS) lib539_LDADD = $(LDADD) lib539_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_201 = lib540-first.$(OBJEXT) -am__objects_202 = lib540-testutil.$(OBJEXT) -am__objects_203 = ../../lib/lib540-warnless.$(OBJEXT) -am_lib540_OBJECTS = lib540-lib540.$(OBJEXT) $(am__objects_201) \ - $(am__objects_202) $(am__objects_203) +am__objects_204 = lib540-first.$(OBJEXT) +am__objects_205 = lib540-testutil.$(OBJEXT) +am__objects_206 = ../../lib/lib540-warnless.$(OBJEXT) +am_lib540_OBJECTS = lib540-lib540.$(OBJEXT) $(am__objects_204) \ + $(am__objects_205) $(am__objects_206) lib540_OBJECTS = $(am_lib540_OBJECTS) lib540_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_204 = lib541-first.$(OBJEXT) -am_lib541_OBJECTS = lib541-lib541.$(OBJEXT) $(am__objects_204) +am__objects_207 = lib541-first.$(OBJEXT) +am_lib541_OBJECTS = lib541-lib541.$(OBJEXT) $(am__objects_207) lib541_OBJECTS = $(am_lib541_OBJECTS) lib541_LDADD = $(LDADD) lib541_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_205 = lib542-first.$(OBJEXT) -am_lib542_OBJECTS = lib542-lib542.$(OBJEXT) $(am__objects_205) +am__objects_208 = lib542-first.$(OBJEXT) +am_lib542_OBJECTS = lib542-lib542.$(OBJEXT) $(am__objects_208) lib542_OBJECTS = $(am_lib542_OBJECTS) lib542_LDADD = $(LDADD) lib542_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_206 = lib543-first.$(OBJEXT) -am_lib543_OBJECTS = lib543-lib543.$(OBJEXT) $(am__objects_206) +am__objects_209 = lib543-first.$(OBJEXT) +am_lib543_OBJECTS = lib543-lib543.$(OBJEXT) $(am__objects_209) lib543_OBJECTS = $(am_lib543_OBJECTS) lib543_LDADD = $(LDADD) lib543_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_207 = lib544-first.$(OBJEXT) -am_lib544_OBJECTS = lib544-lib544.$(OBJEXT) $(am__objects_207) +am__objects_210 = lib544-first.$(OBJEXT) +am_lib544_OBJECTS = lib544-lib544.$(OBJEXT) $(am__objects_210) lib544_OBJECTS = $(am_lib544_OBJECTS) lib544_LDADD = $(LDADD) lib544_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_208 = lib545-first.$(OBJEXT) -am_lib545_OBJECTS = lib545-lib544.$(OBJEXT) $(am__objects_208) +am__objects_211 = lib545-first.$(OBJEXT) +am_lib545_OBJECTS = lib545-lib544.$(OBJEXT) $(am__objects_211) lib545_OBJECTS = $(am_lib545_OBJECTS) lib545_LDADD = $(LDADD) lib545_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_209 = lib547-first.$(OBJEXT) -am_lib547_OBJECTS = lib547-lib547.$(OBJEXT) $(am__objects_209) +am__objects_212 = lib547-first.$(OBJEXT) +am_lib547_OBJECTS = lib547-lib547.$(OBJEXT) $(am__objects_212) lib547_OBJECTS = $(am_lib547_OBJECTS) lib547_LDADD = $(LDADD) lib547_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_210 = lib548-first.$(OBJEXT) -am_lib548_OBJECTS = lib548-lib547.$(OBJEXT) $(am__objects_210) +am__objects_213 = lib548-first.$(OBJEXT) +am_lib548_OBJECTS = lib548-lib547.$(OBJEXT) $(am__objects_213) lib548_OBJECTS = $(am_lib548_OBJECTS) lib548_LDADD = $(LDADD) lib548_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_211 = lib549-first.$(OBJEXT) -am_lib549_OBJECTS = lib549-lib549.$(OBJEXT) $(am__objects_211) +am__objects_214 = lib549-first.$(OBJEXT) +am_lib549_OBJECTS = lib549-lib549.$(OBJEXT) $(am__objects_214) lib549_OBJECTS = $(am_lib549_OBJECTS) lib549_LDADD = $(LDADD) lib549_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_212 = lib552-first.$(OBJEXT) -am__objects_213 = ../../lib/lib552-warnless.$(OBJEXT) -am_lib552_OBJECTS = lib552-lib552.$(OBJEXT) $(am__objects_212) \ - $(am__objects_213) +am__objects_215 = lib552-first.$(OBJEXT) +am__objects_216 = ../../lib/lib552-warnless.$(OBJEXT) +am_lib552_OBJECTS = lib552-lib552.$(OBJEXT) $(am__objects_215) \ + $(am__objects_216) lib552_OBJECTS = $(am_lib552_OBJECTS) lib552_LDADD = $(LDADD) lib552_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_214 = lib553-first.$(OBJEXT) -am_lib553_OBJECTS = lib553-lib553.$(OBJEXT) $(am__objects_214) +am__objects_217 = lib553-first.$(OBJEXT) +am_lib553_OBJECTS = lib553-lib553.$(OBJEXT) $(am__objects_217) lib553_OBJECTS = $(am_lib553_OBJECTS) lib553_LDADD = $(LDADD) lib553_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_215 = lib554-first.$(OBJEXT) -am_lib554_OBJECTS = lib554-lib554.$(OBJEXT) $(am__objects_215) +am__objects_218 = lib554-first.$(OBJEXT) +am_lib554_OBJECTS = lib554-lib554.$(OBJEXT) $(am__objects_218) lib554_OBJECTS = $(am_lib554_OBJECTS) lib554_LDADD = $(LDADD) lib554_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_216 = lib555-first.$(OBJEXT) -am__objects_217 = lib555-testutil.$(OBJEXT) -am__objects_218 = ../../lib/lib555-warnless.$(OBJEXT) -am_lib555_OBJECTS = lib555-lib555.$(OBJEXT) $(am__objects_216) \ - $(am__objects_217) $(am__objects_218) +am__objects_219 = lib555-first.$(OBJEXT) +am__objects_220 = lib555-testutil.$(OBJEXT) +am__objects_221 = ../../lib/lib555-warnless.$(OBJEXT) +am_lib555_OBJECTS = lib555-lib555.$(OBJEXT) $(am__objects_219) \ + $(am__objects_220) $(am__objects_221) lib555_OBJECTS = $(am_lib555_OBJECTS) lib555_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_219 = lib556-first.$(OBJEXT) -am__objects_220 = ../../lib/lib556-warnless.$(OBJEXT) -am_lib556_OBJECTS = lib556-lib556.$(OBJEXT) $(am__objects_219) \ - $(am__objects_220) +am__objects_222 = lib556-first.$(OBJEXT) +am__objects_223 = ../../lib/lib556-warnless.$(OBJEXT) +am_lib556_OBJECTS = lib556-lib556.$(OBJEXT) $(am__objects_222) \ + $(am__objects_223) lib556_OBJECTS = $(am_lib556_OBJECTS) lib556_LDADD = $(LDADD) lib556_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_221 = lib557-first.$(OBJEXT) -am_lib557_OBJECTS = lib557-lib557.$(OBJEXT) $(am__objects_221) +am__objects_224 = lib557-first.$(OBJEXT) +am_lib557_OBJECTS = lib557-lib557.$(OBJEXT) $(am__objects_224) lib557_OBJECTS = $(am_lib557_OBJECTS) lib557_LDADD = $(LDADD) lib557_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_222 = lib558-first.$(OBJEXT) -am_lib558_OBJECTS = lib558-lib558.$(OBJEXT) $(am__objects_222) +am__objects_225 = lib558-first.$(OBJEXT) +am_lib558_OBJECTS = lib558-lib558.$(OBJEXT) $(am__objects_225) lib558_OBJECTS = $(am_lib558_OBJECTS) lib558_LDADD = $(LDADD) lib558_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_223 = lib559-first.$(OBJEXT) -am_lib559_OBJECTS = lib559-lib559.$(OBJEXT) $(am__objects_223) +am__objects_226 = lib559-first.$(OBJEXT) +am_lib559_OBJECTS = lib559-lib559.$(OBJEXT) $(am__objects_226) lib559_OBJECTS = $(am_lib559_OBJECTS) lib559_LDADD = $(LDADD) lib559_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_224 = lib560-first.$(OBJEXT) -am__objects_225 = lib560-testutil.$(OBJEXT) -am__objects_226 = ../../lib/lib560-warnless.$(OBJEXT) -am_lib560_OBJECTS = lib560-lib560.$(OBJEXT) $(am__objects_224) \ - $(am__objects_225) $(am__objects_226) +am__objects_227 = lib560-first.$(OBJEXT) +am__objects_228 = lib560-testutil.$(OBJEXT) +am__objects_229 = ../../lib/lib560-warnless.$(OBJEXT) +am_lib560_OBJECTS = lib560-lib560.$(OBJEXT) $(am__objects_227) \ + $(am__objects_228) $(am__objects_229) lib560_OBJECTS = $(am_lib560_OBJECTS) lib560_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_227 = lib562-first.$(OBJEXT) -am_lib562_OBJECTS = lib562-lib562.$(OBJEXT) $(am__objects_227) +am__objects_230 = lib562-first.$(OBJEXT) +am_lib562_OBJECTS = lib562-lib562.$(OBJEXT) $(am__objects_230) lib562_OBJECTS = $(am_lib562_OBJECTS) lib562_LDADD = $(LDADD) lib562_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_228 = lib564-first.$(OBJEXT) -am__objects_229 = lib564-testutil.$(OBJEXT) -am__objects_230 = ../../lib/lib564-warnless.$(OBJEXT) -am_lib564_OBJECTS = lib564-lib564.$(OBJEXT) $(am__objects_228) \ - $(am__objects_229) $(am__objects_230) +am__objects_231 = lib564-first.$(OBJEXT) +am__objects_232 = lib564-testutil.$(OBJEXT) +am__objects_233 = ../../lib/lib564-warnless.$(OBJEXT) +am_lib564_OBJECTS = lib564-lib564.$(OBJEXT) $(am__objects_231) \ + $(am__objects_232) $(am__objects_233) lib564_OBJECTS = $(am_lib564_OBJECTS) lib564_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_231 = lib565-first.$(OBJEXT) -am_lib565_OBJECTS = lib565-lib510.$(OBJEXT) $(am__objects_231) +am__objects_234 = lib565-first.$(OBJEXT) +am_lib565_OBJECTS = lib565-lib510.$(OBJEXT) $(am__objects_234) lib565_OBJECTS = $(am_lib565_OBJECTS) lib565_LDADD = $(LDADD) lib565_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_232 = lib566-first.$(OBJEXT) -am_lib566_OBJECTS = lib566-lib566.$(OBJEXT) $(am__objects_232) +am__objects_235 = lib566-first.$(OBJEXT) +am_lib566_OBJECTS = lib566-lib566.$(OBJEXT) $(am__objects_235) lib566_OBJECTS = $(am_lib566_OBJECTS) lib566_LDADD = $(LDADD) lib566_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_233 = lib567-first.$(OBJEXT) -am_lib567_OBJECTS = lib567-lib567.$(OBJEXT) $(am__objects_233) +am__objects_236 = lib567-first.$(OBJEXT) +am_lib567_OBJECTS = lib567-lib567.$(OBJEXT) $(am__objects_236) lib567_OBJECTS = $(am_lib567_OBJECTS) lib567_LDADD = $(LDADD) lib567_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_234 = lib568-first.$(OBJEXT) -am_lib568_OBJECTS = lib568-lib568.$(OBJEXT) $(am__objects_234) +am__objects_237 = lib568-first.$(OBJEXT) +am_lib568_OBJECTS = lib568-lib568.$(OBJEXT) $(am__objects_237) lib568_OBJECTS = $(am_lib568_OBJECTS) lib568_LDADD = $(LDADD) lib568_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_235 = lib569-first.$(OBJEXT) -am_lib569_OBJECTS = lib569-lib569.$(OBJEXT) $(am__objects_235) +am__objects_238 = lib569-first.$(OBJEXT) +am_lib569_OBJECTS = lib569-lib569.$(OBJEXT) $(am__objects_238) lib569_OBJECTS = $(am_lib569_OBJECTS) lib569_LDADD = $(LDADD) lib569_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_236 = lib570-first.$(OBJEXT) -am_lib570_OBJECTS = lib570-lib570.$(OBJEXT) $(am__objects_236) +am__objects_239 = lib570-first.$(OBJEXT) +am_lib570_OBJECTS = lib570-lib570.$(OBJEXT) $(am__objects_239) lib570_OBJECTS = $(am_lib570_OBJECTS) lib570_LDADD = $(LDADD) lib570_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_237 = lib571-first.$(OBJEXT) -am__objects_238 = ../../lib/lib571-warnless.$(OBJEXT) -am_lib571_OBJECTS = lib571-lib571.$(OBJEXT) $(am__objects_237) \ - $(am__objects_238) +am__objects_240 = lib571-first.$(OBJEXT) +am__objects_241 = ../../lib/lib571-warnless.$(OBJEXT) +am_lib571_OBJECTS = lib571-lib571.$(OBJEXT) $(am__objects_240) \ + $(am__objects_241) lib571_OBJECTS = $(am_lib571_OBJECTS) lib571_LDADD = $(LDADD) lib571_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_239 = lib572-first.$(OBJEXT) -am_lib572_OBJECTS = lib572-lib572.$(OBJEXT) $(am__objects_239) +am__objects_242 = lib572-first.$(OBJEXT) +am_lib572_OBJECTS = lib572-lib572.$(OBJEXT) $(am__objects_242) lib572_OBJECTS = $(am_lib572_OBJECTS) lib572_LDADD = $(LDADD) lib572_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_240 = lib573-first.$(OBJEXT) -am__objects_241 = lib573-testutil.$(OBJEXT) -am__objects_242 = ../../lib/lib573-warnless.$(OBJEXT) -am__objects_243 = lib573-testtrace.$(OBJEXT) -am_lib573_OBJECTS = lib573-lib573.$(OBJEXT) $(am__objects_240) \ - $(am__objects_241) $(am__objects_242) $(am__objects_243) +am__objects_243 = lib573-first.$(OBJEXT) +am__objects_244 = lib573-testutil.$(OBJEXT) +am__objects_245 = ../../lib/lib573-warnless.$(OBJEXT) +am__objects_246 = lib573-testtrace.$(OBJEXT) +am_lib573_OBJECTS = lib573-lib573.$(OBJEXT) $(am__objects_243) \ + $(am__objects_244) $(am__objects_245) $(am__objects_246) lib573_OBJECTS = $(am_lib573_OBJECTS) lib573_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_244 = lib574-first.$(OBJEXT) -am_lib574_OBJECTS = lib574-lib574.$(OBJEXT) $(am__objects_244) +am__objects_247 = lib574-first.$(OBJEXT) +am_lib574_OBJECTS = lib574-lib574.$(OBJEXT) $(am__objects_247) lib574_OBJECTS = $(am_lib574_OBJECTS) lib574_LDADD = $(LDADD) lib574_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_245 = lib575-first.$(OBJEXT) -am__objects_246 = lib575-testutil.$(OBJEXT) -am__objects_247 = ../../lib/lib575-warnless.$(OBJEXT) -am_lib575_OBJECTS = lib575-lib575.$(OBJEXT) $(am__objects_245) \ - $(am__objects_246) $(am__objects_247) +am__objects_248 = lib575-first.$(OBJEXT) +am__objects_249 = lib575-testutil.$(OBJEXT) +am__objects_250 = ../../lib/lib575-warnless.$(OBJEXT) +am_lib575_OBJECTS = lib575-lib575.$(OBJEXT) $(am__objects_248) \ + $(am__objects_249) $(am__objects_250) lib575_OBJECTS = $(am_lib575_OBJECTS) lib575_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_248 = lib576-first.$(OBJEXT) -am_lib576_OBJECTS = lib576-lib576.$(OBJEXT) $(am__objects_248) +am__objects_251 = lib576-first.$(OBJEXT) +am_lib576_OBJECTS = lib576-lib576.$(OBJEXT) $(am__objects_251) lib576_OBJECTS = $(am_lib576_OBJECTS) lib576_LDADD = $(LDADD) lib576_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_249 = lib578-first.$(OBJEXT) -am_lib578_OBJECTS = lib578-lib578.$(OBJEXT) $(am__objects_249) +am__objects_252 = lib578-first.$(OBJEXT) +am_lib578_OBJECTS = lib578-lib578.$(OBJEXT) $(am__objects_252) lib578_OBJECTS = $(am_lib578_OBJECTS) lib578_LDADD = $(LDADD) lib578_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_250 = lib579-first.$(OBJEXT) -am_lib579_OBJECTS = lib579-lib579.$(OBJEXT) $(am__objects_250) +am__objects_253 = lib579-first.$(OBJEXT) +am_lib579_OBJECTS = lib579-lib579.$(OBJEXT) $(am__objects_253) lib579_OBJECTS = $(am_lib579_OBJECTS) lib579_LDADD = $(LDADD) lib579_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_251 = lib582-first.$(OBJEXT) -am__objects_252 = lib582-testutil.$(OBJEXT) -am__objects_253 = ../../lib/lib582-warnless.$(OBJEXT) -am_lib582_OBJECTS = lib582-lib582.$(OBJEXT) $(am__objects_251) \ - $(am__objects_252) $(am__objects_253) +am__objects_254 = lib582-first.$(OBJEXT) +am__objects_255 = lib582-testutil.$(OBJEXT) +am__objects_256 = ../../lib/lib582-warnless.$(OBJEXT) +am_lib582_OBJECTS = lib582-lib582.$(OBJEXT) $(am__objects_254) \ + $(am__objects_255) $(am__objects_256) lib582_OBJECTS = $(am_lib582_OBJECTS) lib582_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_254 = lib583-first.$(OBJEXT) -am_lib583_OBJECTS = lib583-lib583.$(OBJEXT) $(am__objects_254) +am__objects_257 = lib583-first.$(OBJEXT) +am_lib583_OBJECTS = lib583-lib583.$(OBJEXT) $(am__objects_257) lib583_OBJECTS = $(am_lib583_OBJECTS) lib583_LDADD = $(LDADD) lib583_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_255 = lib585-first.$(OBJEXT) -am__objects_256 = lib585-testutil.$(OBJEXT) -am__objects_257 = lib585-testtrace.$(OBJEXT) -am_lib585_OBJECTS = lib585-lib500.$(OBJEXT) $(am__objects_255) \ - $(am__objects_256) $(am__objects_257) +am__objects_258 = lib585-first.$(OBJEXT) +am__objects_259 = lib585-testutil.$(OBJEXT) +am__objects_260 = lib585-testtrace.$(OBJEXT) +am_lib585_OBJECTS = lib585-lib500.$(OBJEXT) $(am__objects_258) \ + $(am__objects_259) $(am__objects_260) lib585_OBJECTS = $(am_lib585_OBJECTS) lib585_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_258 = lib586-first.$(OBJEXT) -am_lib586_OBJECTS = lib586-lib586.$(OBJEXT) $(am__objects_258) +am__objects_261 = lib586-first.$(OBJEXT) +am_lib586_OBJECTS = lib586-lib586.$(OBJEXT) $(am__objects_261) lib586_OBJECTS = $(am_lib586_OBJECTS) lib586_LDADD = $(LDADD) lib586_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_259 = lib587-first.$(OBJEXT) -am_lib587_OBJECTS = lib587-lib554.$(OBJEXT) $(am__objects_259) +am__objects_262 = lib587-first.$(OBJEXT) +am_lib587_OBJECTS = lib587-lib554.$(OBJEXT) $(am__objects_262) lib587_OBJECTS = $(am_lib587_OBJECTS) lib587_LDADD = $(LDADD) lib587_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_260 = lib589-first.$(OBJEXT) -am_lib589_OBJECTS = lib589-lib589.$(OBJEXT) $(am__objects_260) +am__objects_263 = lib589-first.$(OBJEXT) +am_lib589_OBJECTS = lib589-lib589.$(OBJEXT) $(am__objects_263) lib589_OBJECTS = $(am_lib589_OBJECTS) lib589_LDADD = $(LDADD) lib589_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_261 = lib590-first.$(OBJEXT) -am_lib590_OBJECTS = lib590-lib590.$(OBJEXT) $(am__objects_261) +am__objects_264 = lib590-first.$(OBJEXT) +am_lib590_OBJECTS = lib590-lib590.$(OBJEXT) $(am__objects_264) lib590_OBJECTS = $(am_lib590_OBJECTS) lib590_LDADD = $(LDADD) lib590_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_262 = lib591-first.$(OBJEXT) -am__objects_263 = lib591-testutil.$(OBJEXT) -am__objects_264 = ../../lib/lib591-warnless.$(OBJEXT) -am_lib591_OBJECTS = lib591-lib591.$(OBJEXT) $(am__objects_262) \ - $(am__objects_263) $(am__objects_264) +am__objects_265 = lib591-first.$(OBJEXT) +am__objects_266 = lib591-testutil.$(OBJEXT) +am__objects_267 = ../../lib/lib591-warnless.$(OBJEXT) +am_lib591_OBJECTS = lib591-lib591.$(OBJEXT) $(am__objects_265) \ + $(am__objects_266) $(am__objects_267) lib591_OBJECTS = $(am_lib591_OBJECTS) lib591_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_265 = lib597-first.$(OBJEXT) -am__objects_266 = lib597-testutil.$(OBJEXT) -am__objects_267 = ../../lib/lib597-warnless.$(OBJEXT) -am_lib597_OBJECTS = lib597-lib597.$(OBJEXT) $(am__objects_265) \ - $(am__objects_266) $(am__objects_267) +am__objects_268 = lib597-first.$(OBJEXT) +am__objects_269 = lib597-testutil.$(OBJEXT) +am__objects_270 = ../../lib/lib597-warnless.$(OBJEXT) +am_lib597_OBJECTS = lib597-lib597.$(OBJEXT) $(am__objects_268) \ + $(am__objects_269) $(am__objects_270) lib597_OBJECTS = $(am_lib597_OBJECTS) lib597_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_268 = lib598-first.$(OBJEXT) -am_lib598_OBJECTS = lib598-lib598.$(OBJEXT) $(am__objects_268) +am__objects_271 = lib598-first.$(OBJEXT) +am_lib598_OBJECTS = lib598-lib598.$(OBJEXT) $(am__objects_271) lib598_OBJECTS = $(am_lib598_OBJECTS) lib598_LDADD = $(LDADD) lib598_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_269 = lib599-first.$(OBJEXT) -am_lib599_OBJECTS = lib599-lib599.$(OBJEXT) $(am__objects_269) +am__objects_272 = lib599-first.$(OBJEXT) +am_lib599_OBJECTS = lib599-lib599.$(OBJEXT) $(am__objects_272) lib599_OBJECTS = $(am_lib599_OBJECTS) lib599_LDADD = $(LDADD) lib599_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_270 = lib643-first.$(OBJEXT) -am_lib643_OBJECTS = lib643-lib643.$(OBJEXT) $(am__objects_270) +am__objects_273 = lib643-first.$(OBJEXT) +am_lib643_OBJECTS = lib643-lib643.$(OBJEXT) $(am__objects_273) lib643_OBJECTS = $(am_lib643_OBJECTS) lib643_LDADD = $(LDADD) lib643_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_271 = lib644-first.$(OBJEXT) -am_lib644_OBJECTS = lib644-lib643.$(OBJEXT) $(am__objects_271) +am__objects_274 = lib644-first.$(OBJEXT) +am_lib644_OBJECTS = lib644-lib643.$(OBJEXT) $(am__objects_274) lib644_OBJECTS = $(am_lib644_OBJECTS) lib644_LDADD = $(LDADD) lib644_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_272 = lib645-first.$(OBJEXT) -am_lib645_OBJECTS = lib645-lib643.$(OBJEXT) $(am__objects_272) +am__objects_275 = lib645-first.$(OBJEXT) +am_lib645_OBJECTS = lib645-lib643.$(OBJEXT) $(am__objects_275) lib645_OBJECTS = $(am_lib645_OBJECTS) lib645_LDADD = $(LDADD) lib645_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_273 = lib650-first.$(OBJEXT) -am_lib650_OBJECTS = lib650-lib650.$(OBJEXT) $(am__objects_273) +am__objects_276 = lib650-first.$(OBJEXT) +am_lib650_OBJECTS = lib650-lib650.$(OBJEXT) $(am__objects_276) lib650_OBJECTS = $(am_lib650_OBJECTS) lib650_LDADD = $(LDADD) lib650_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_274 = lib651-first.$(OBJEXT) -am_lib651_OBJECTS = lib651-lib651.$(OBJEXT) $(am__objects_274) +am__objects_277 = lib651-first.$(OBJEXT) +am_lib651_OBJECTS = lib651-lib651.$(OBJEXT) $(am__objects_277) lib651_OBJECTS = $(am_lib651_OBJECTS) lib651_LDADD = $(LDADD) lib651_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_275 = lib652-first.$(OBJEXT) -am_lib652_OBJECTS = lib652-lib652.$(OBJEXT) $(am__objects_275) +am__objects_278 = lib652-first.$(OBJEXT) +am_lib652_OBJECTS = lib652-lib652.$(OBJEXT) $(am__objects_278) lib652_OBJECTS = $(am_lib652_OBJECTS) lib652_LDADD = $(LDADD) lib652_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_276 = lib653-first.$(OBJEXT) -am_lib653_OBJECTS = lib653-lib653.$(OBJEXT) $(am__objects_276) +am__objects_279 = lib653-first.$(OBJEXT) +am_lib653_OBJECTS = lib653-lib653.$(OBJEXT) $(am__objects_279) lib653_OBJECTS = $(am_lib653_OBJECTS) lib653_LDADD = $(LDADD) lib653_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_277 = lib654-first.$(OBJEXT) -am_lib654_OBJECTS = lib654-lib654.$(OBJEXT) $(am__objects_277) +am__objects_280 = lib654-first.$(OBJEXT) +am_lib654_OBJECTS = lib654-lib654.$(OBJEXT) $(am__objects_280) lib654_OBJECTS = $(am_lib654_OBJECTS) lib654_LDADD = $(LDADD) lib654_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_278 = lib655-first.$(OBJEXT) -am_lib655_OBJECTS = lib655-lib655.$(OBJEXT) $(am__objects_278) +am__objects_281 = lib655-first.$(OBJEXT) +am_lib655_OBJECTS = lib655-lib655.$(OBJEXT) $(am__objects_281) lib655_OBJECTS = $(am_lib655_OBJECTS) lib655_LDADD = $(LDADD) lib655_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_279 = lib658-first.$(OBJEXT) -am__objects_280 = lib658-testutil.$(OBJEXT) -am__objects_281 = ../../lib/lib658-warnless.$(OBJEXT) -am_lib658_OBJECTS = lib658-lib658.$(OBJEXT) $(am__objects_279) \ - $(am__objects_280) $(am__objects_281) +am__objects_282 = lib658-first.$(OBJEXT) +am__objects_283 = lib658-testutil.$(OBJEXT) +am__objects_284 = ../../lib/lib658-warnless.$(OBJEXT) +am_lib658_OBJECTS = lib658-lib658.$(OBJEXT) $(am__objects_282) \ + $(am__objects_283) $(am__objects_284) lib658_OBJECTS = $(am_lib658_OBJECTS) lib658_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_282 = lib659-first.$(OBJEXT) -am__objects_283 = lib659-testutil.$(OBJEXT) -am__objects_284 = ../../lib/lib659-warnless.$(OBJEXT) -am_lib659_OBJECTS = lib659-lib659.$(OBJEXT) $(am__objects_282) \ - $(am__objects_283) $(am__objects_284) +am__objects_285 = lib659-first.$(OBJEXT) +am__objects_286 = lib659-testutil.$(OBJEXT) +am__objects_287 = ../../lib/lib659-warnless.$(OBJEXT) +am_lib659_OBJECTS = lib659-lib659.$(OBJEXT) $(am__objects_285) \ + $(am__objects_286) $(am__objects_287) lib659_OBJECTS = $(am_lib659_OBJECTS) lib659_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_285 = libauthretry-first.$(OBJEXT) +am__objects_288 = libauthretry-first.$(OBJEXT) am_libauthretry_OBJECTS = libauthretry-libauthretry.$(OBJEXT) \ - $(am__objects_285) + $(am__objects_288) libauthretry_OBJECTS = $(am_libauthretry_OBJECTS) libauthretry_LDADD = $(LDADD) libauthretry_DEPENDENCIES = $(am__DEPENDENCIES_1) -am__objects_286 = libntlmconnect-first.$(OBJEXT) -am__objects_287 = libntlmconnect-testutil.$(OBJEXT) -am__objects_288 = ../../lib/libntlmconnect-warnless.$(OBJEXT) +am__objects_289 = libntlmconnect-first.$(OBJEXT) +am__objects_290 = libntlmconnect-testutil.$(OBJEXT) +am__objects_291 = ../../lib/libntlmconnect-warnless.$(OBJEXT) am_libntlmconnect_OBJECTS = libntlmconnect-libntlmconnect.$(OBJEXT) \ - $(am__objects_286) $(am__objects_287) $(am__objects_288) + $(am__objects_289) $(am__objects_290) $(am__objects_291) libntlmconnect_OBJECTS = $(am_libntlmconnect_OBJECTS) libntlmconnect_DEPENDENCIES = $(am__DEPENDENCIES_1) AM_V_P = $(am__v_P_@AM_V@) @@ -1154,6 +1166,7 @@ am__depfiles_remade = \ ../../lib/$(DEPDIR)/lib1557-warnless.Po \ ../../lib/$(DEPDIR)/lib1591-warnless.Po \ ../../lib/$(DEPDIR)/lib1592-warnless.Po \ + ../../lib/$(DEPDIR)/lib1596-warnless.Po \ ../../lib/$(DEPDIR)/lib1900-warnless.Po \ ../../lib/$(DEPDIR)/lib1905-warnless.Po \ ../../lib/$(DEPDIR)/lib1906-warnless.Po \ @@ -1260,6 +1273,8 @@ am__depfiles_remade = \ ./$(DEPDIR)/lib1591-lib1591.Po ./$(DEPDIR)/lib1591-testutil.Po \ ./$(DEPDIR)/lib1592-first.Po ./$(DEPDIR)/lib1592-lib1592.Po \ ./$(DEPDIR)/lib1592-testutil.Po ./$(DEPDIR)/lib1593.Po \ + ./$(DEPDIR)/lib1594.Po ./$(DEPDIR)/lib1596-first.Po \ + ./$(DEPDIR)/lib1596-lib1594.Po ./$(DEPDIR)/lib1596-testutil.Po \ ./$(DEPDIR)/lib1900-first.Po ./$(DEPDIR)/lib1900-lib1900.Po \ ./$(DEPDIR)/lib1900-testutil.Po ./$(DEPDIR)/lib1905-first.Po \ ./$(DEPDIR)/lib1905-lib1905.Po ./$(DEPDIR)/lib1905-testutil.Po \ @@ -1416,7 +1431,60 @@ SOURCES = $(libhostname_la_SOURCES) $(libstubgss_la_SOURCES) \ $(lib1554_SOURCES) $(lib1555_SOURCES) $(lib1556_SOURCES) \ $(lib1557_SOURCES) $(lib1558_SOURCES) $(lib1559_SOURCES) \ $(lib1560_SOURCES) $(lib1591_SOURCES) $(lib1592_SOURCES) \ - $(lib1593_SOURCES) $(lib1900_SOURCES) $(lib1905_SOURCES) \ + $(lib1593_SOURCES) $(lib1594_SOURCES) $(lib1596_SOURCES) \ + $(lib1900_SOURCES) $(lib1905_SOURCES) $(lib1906_SOURCES) \ + $(lib2033_SOURCES) $(lib500_SOURCES) $(lib501_SOURCES) \ + $(lib502_SOURCES) $(lib503_SOURCES) $(lib504_SOURCES) \ + $(lib505_SOURCES) $(lib506_SOURCES) $(lib507_SOURCES) \ + $(lib508_SOURCES) $(lib509_SOURCES) $(lib510_SOURCES) \ + $(lib511_SOURCES) $(lib512_SOURCES) $(lib513_SOURCES) \ + $(lib514_SOURCES) $(lib515_SOURCES) $(lib516_SOURCES) \ + $(lib517_SOURCES) $(lib518_SOURCES) $(lib519_SOURCES) \ + $(lib520_SOURCES) $(lib521_SOURCES) $(lib523_SOURCES) \ + $(lib524_SOURCES) $(lib525_SOURCES) $(lib526_SOURCES) \ + $(lib527_SOURCES) $(lib529_SOURCES) $(lib530_SOURCES) \ + $(lib532_SOURCES) $(lib533_SOURCES) $(lib537_SOURCES) \ + $(lib539_SOURCES) $(lib540_SOURCES) $(lib541_SOURCES) \ + $(lib542_SOURCES) $(lib543_SOURCES) $(lib544_SOURCES) \ + $(lib545_SOURCES) $(lib547_SOURCES) $(lib548_SOURCES) \ + $(lib549_SOURCES) $(lib552_SOURCES) $(lib553_SOURCES) \ + $(lib554_SOURCES) $(lib555_SOURCES) $(lib556_SOURCES) \ + $(lib557_SOURCES) $(lib558_SOURCES) $(lib559_SOURCES) \ + $(lib560_SOURCES) $(lib562_SOURCES) $(lib564_SOURCES) \ + $(lib565_SOURCES) $(lib566_SOURCES) $(lib567_SOURCES) \ + $(lib568_SOURCES) $(lib569_SOURCES) $(lib570_SOURCES) \ + $(lib571_SOURCES) $(lib572_SOURCES) $(lib573_SOURCES) \ + $(lib574_SOURCES) $(lib575_SOURCES) $(lib576_SOURCES) \ + $(lib578_SOURCES) $(lib579_SOURCES) $(lib582_SOURCES) \ + $(lib583_SOURCES) $(lib585_SOURCES) $(lib586_SOURCES) \ + $(lib587_SOURCES) $(lib589_SOURCES) $(lib590_SOURCES) \ + $(lib591_SOURCES) $(lib597_SOURCES) $(lib598_SOURCES) \ + $(lib599_SOURCES) $(lib643_SOURCES) $(lib644_SOURCES) \ + $(lib645_SOURCES) $(lib650_SOURCES) $(lib651_SOURCES) \ + $(lib652_SOURCES) $(lib653_SOURCES) $(lib654_SOURCES) \ + $(lib655_SOURCES) $(lib658_SOURCES) $(lib659_SOURCES) \ + $(libauthretry_SOURCES) $(libntlmconnect_SOURCES) +DIST_SOURCES = $(libhostname_la_SOURCES) \ + $(am__libstubgss_la_SOURCES_DIST) $(chkdecimalpoint_SOURCES) \ + $(chkhostname_SOURCES) $(lib1156_SOURCES) $(lib1500_SOURCES) \ + $(lib1501_SOURCES) $(lib1502_SOURCES) $(lib1503_SOURCES) \ + $(lib1504_SOURCES) $(lib1505_SOURCES) $(lib1506_SOURCES) \ + $(lib1507_SOURCES) $(lib1508_SOURCES) $(lib1509_SOURCES) \ + $(lib1510_SOURCES) $(lib1511_SOURCES) $(lib1512_SOURCES) \ + $(lib1513_SOURCES) $(lib1514_SOURCES) $(lib1515_SOURCES) \ + $(lib1517_SOURCES) $(lib1518_SOURCES) $(lib1520_SOURCES) \ + $(lib1522_SOURCES) $(lib1523_SOURCES) $(lib1525_SOURCES) \ + $(lib1526_SOURCES) $(lib1527_SOURCES) $(lib1528_SOURCES) \ + $(lib1529_SOURCES) $(lib1530_SOURCES) $(lib1531_SOURCES) \ + $(lib1532_SOURCES) $(lib1533_SOURCES) $(lib1534_SOURCES) \ + $(lib1535_SOURCES) $(lib1536_SOURCES) $(lib1537_SOURCES) \ + $(lib1538_SOURCES) $(lib1540_SOURCES) $(lib1541_SOURCES) \ + $(lib1550_SOURCES) $(lib1551_SOURCES) $(lib1552_SOURCES) \ + $(lib1553_SOURCES) $(lib1554_SOURCES) $(lib1555_SOURCES) \ + $(lib1556_SOURCES) $(lib1557_SOURCES) $(lib1558_SOURCES) \ + $(lib1559_SOURCES) $(lib1560_SOURCES) $(lib1591_SOURCES) \ + $(lib1592_SOURCES) $(lib1593_SOURCES) $(lib1594_SOURCES) \ + $(lib1596_SOURCES) $(lib1900_SOURCES) $(lib1905_SOURCES) \ $(lib1906_SOURCES) $(lib2033_SOURCES) $(lib500_SOURCES) \ $(lib501_SOURCES) $(lib502_SOURCES) $(lib503_SOURCES) \ $(lib504_SOURCES) $(lib505_SOURCES) $(lib506_SOURCES) \ @@ -1449,58 +1517,6 @@ SOURCES = $(libhostname_la_SOURCES) $(libstubgss_la_SOURCES) \ $(lib654_SOURCES) $(lib655_SOURCES) $(lib658_SOURCES) \ $(lib659_SOURCES) $(libauthretry_SOURCES) \ $(libntlmconnect_SOURCES) -DIST_SOURCES = $(libhostname_la_SOURCES) \ - $(am__libstubgss_la_SOURCES_DIST) $(chkdecimalpoint_SOURCES) \ - $(chkhostname_SOURCES) $(lib1156_SOURCES) $(lib1500_SOURCES) \ - $(lib1501_SOURCES) $(lib1502_SOURCES) $(lib1503_SOURCES) \ - $(lib1504_SOURCES) $(lib1505_SOURCES) $(lib1506_SOURCES) \ - $(lib1507_SOURCES) $(lib1508_SOURCES) $(lib1509_SOURCES) \ - $(lib1510_SOURCES) $(lib1511_SOURCES) $(lib1512_SOURCES) \ - $(lib1513_SOURCES) $(lib1514_SOURCES) $(lib1515_SOURCES) \ - $(lib1517_SOURCES) $(lib1518_SOURCES) $(lib1520_SOURCES) \ - $(lib1522_SOURCES) $(lib1523_SOURCES) $(lib1525_SOURCES) \ - $(lib1526_SOURCES) $(lib1527_SOURCES) $(lib1528_SOURCES) \ - $(lib1529_SOURCES) $(lib1530_SOURCES) $(lib1531_SOURCES) \ - $(lib1532_SOURCES) $(lib1533_SOURCES) $(lib1534_SOURCES) \ - $(lib1535_SOURCES) $(lib1536_SOURCES) $(lib1537_SOURCES) \ - $(lib1538_SOURCES) $(lib1540_SOURCES) $(lib1541_SOURCES) \ - $(lib1550_SOURCES) $(lib1551_SOURCES) $(lib1552_SOURCES) \ - $(lib1553_SOURCES) $(lib1554_SOURCES) $(lib1555_SOURCES) \ - $(lib1556_SOURCES) $(lib1557_SOURCES) $(lib1558_SOURCES) \ - $(lib1559_SOURCES) $(lib1560_SOURCES) $(lib1591_SOURCES) \ - $(lib1592_SOURCES) $(lib1593_SOURCES) $(lib1900_SOURCES) \ - $(lib1905_SOURCES) $(lib1906_SOURCES) $(lib2033_SOURCES) \ - $(lib500_SOURCES) $(lib501_SOURCES) $(lib502_SOURCES) \ - $(lib503_SOURCES) $(lib504_SOURCES) $(lib505_SOURCES) \ - $(lib506_SOURCES) $(lib507_SOURCES) $(lib508_SOURCES) \ - $(lib509_SOURCES) $(lib510_SOURCES) $(lib511_SOURCES) \ - $(lib512_SOURCES) $(lib513_SOURCES) $(lib514_SOURCES) \ - $(lib515_SOURCES) $(lib516_SOURCES) $(lib517_SOURCES) \ - $(lib518_SOURCES) $(lib519_SOURCES) $(lib520_SOURCES) \ - $(lib521_SOURCES) $(lib523_SOURCES) $(lib524_SOURCES) \ - $(lib525_SOURCES) $(lib526_SOURCES) $(lib527_SOURCES) \ - $(lib529_SOURCES) $(lib530_SOURCES) $(lib532_SOURCES) \ - $(lib533_SOURCES) $(lib537_SOURCES) $(lib539_SOURCES) \ - $(lib540_SOURCES) $(lib541_SOURCES) $(lib542_SOURCES) \ - $(lib543_SOURCES) $(lib544_SOURCES) $(lib545_SOURCES) \ - $(lib547_SOURCES) $(lib548_SOURCES) $(lib549_SOURCES) \ - $(lib552_SOURCES) $(lib553_SOURCES) $(lib554_SOURCES) \ - $(lib555_SOURCES) $(lib556_SOURCES) $(lib557_SOURCES) \ - $(lib558_SOURCES) $(lib559_SOURCES) $(lib560_SOURCES) \ - $(lib562_SOURCES) $(lib564_SOURCES) $(lib565_SOURCES) \ - $(lib566_SOURCES) $(lib567_SOURCES) $(lib568_SOURCES) \ - $(lib569_SOURCES) $(lib570_SOURCES) $(lib571_SOURCES) \ - $(lib572_SOURCES) $(lib573_SOURCES) $(lib574_SOURCES) \ - $(lib575_SOURCES) $(lib576_SOURCES) $(lib578_SOURCES) \ - $(lib579_SOURCES) $(lib582_SOURCES) $(lib583_SOURCES) \ - $(lib585_SOURCES) $(lib586_SOURCES) $(lib587_SOURCES) \ - $(lib589_SOURCES) $(lib590_SOURCES) $(lib591_SOURCES) \ - $(lib597_SOURCES) $(lib598_SOURCES) $(lib599_SOURCES) \ - $(lib643_SOURCES) $(lib644_SOURCES) $(lib645_SOURCES) \ - $(lib650_SOURCES) $(lib651_SOURCES) $(lib652_SOURCES) \ - $(lib653_SOURCES) $(lib654_SOURCES) $(lib655_SOURCES) \ - $(lib658_SOURCES) $(lib659_SOURCES) $(libauthretry_SOURCES) \ - $(libntlmconnect_SOURCES) am__can_run_installinfo = \ case $$AM_UPDATE_INFO_DIR in \ n|no|NO) false;; \ @@ -1663,8 +1679,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ @@ -2158,6 +2178,11 @@ lib1592_LDADD = $(TESTUTIL_LIBS) lib1592_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1592 lib1593_SOURCES = lib1593.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1593_LDADD = $(TESTUTIL_LIBS) +lib1594_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1594_LDADD = $(TESTUTIL_LIBS) +lib1596_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1596_LDADD = $(TESTUTIL_LIBS) +lib1596_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1596 lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) @@ -2569,6 +2594,16 @@ lib1592$(EXEEXT): $(lib1592_OBJECTS) $(lib1592_DEPENDENCIES) $(EXTRA_lib1592_DEP lib1593$(EXEEXT): $(lib1593_OBJECTS) $(lib1593_DEPENDENCIES) $(EXTRA_lib1593_DEPENDENCIES) @rm -f lib1593$(EXEEXT) $(AM_V_CCLD)$(LINK) $(lib1593_OBJECTS) $(lib1593_LDADD) $(LIBS) + +lib1594$(EXEEXT): $(lib1594_OBJECTS) $(lib1594_DEPENDENCIES) $(EXTRA_lib1594_DEPENDENCIES) + @rm -f lib1594$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1594_OBJECTS) $(lib1594_LDADD) $(LIBS) +../../lib/lib1596-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ + ../../lib/$(DEPDIR)/$(am__dirstamp) + +lib1596$(EXEEXT): $(lib1596_OBJECTS) $(lib1596_DEPENDENCIES) $(EXTRA_lib1596_DEPENDENCIES) + @rm -f lib1596$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(lib1596_OBJECTS) $(lib1596_LDADD) $(LIBS) ../../lib/lib1900-warnless.$(OBJEXT): ../../lib/$(am__dirstamp) \ ../../lib/$(DEPDIR)/$(am__dirstamp) @@ -3061,6 +3096,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1557-warnless.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1591-warnless.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1592-warnless.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1596-warnless.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1900-warnless.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1905-warnless.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@../../lib/$(DEPDIR)/lib1906-warnless.Po@am__quote@ # am--include-marker @@ -3239,6 +3275,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1592-lib1592.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1592-testutil.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1593.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1594.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1596-first.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1596-lib1594.Po@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1596-testutil.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-first.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-lib1900.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lib1900-testutil.Po@am__quote@ # am--include-marker @@ -6029,6 +6069,62 @@ lib1592-testutil.obj: testutil.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1592_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1592-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +lib1596-lib1594.o: lib1594.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-lib1594.o -MD -MP -MF $(DEPDIR)/lib1596-lib1594.Tpo -c -o lib1596-lib1594.o `test -f 'lib1594.c' || echo '$(srcdir)/'`lib1594.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-lib1594.Tpo $(DEPDIR)/lib1596-lib1594.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1594.c' object='lib1596-lib1594.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-lib1594.o `test -f 'lib1594.c' || echo '$(srcdir)/'`lib1594.c + +lib1596-lib1594.obj: lib1594.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-lib1594.obj -MD -MP -MF $(DEPDIR)/lib1596-lib1594.Tpo -c -o lib1596-lib1594.obj `if test -f 'lib1594.c'; then $(CYGPATH_W) 'lib1594.c'; else $(CYGPATH_W) '$(srcdir)/lib1594.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-lib1594.Tpo $(DEPDIR)/lib1596-lib1594.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lib1594.c' object='lib1596-lib1594.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-lib1594.obj `if test -f 'lib1594.c'; then $(CYGPATH_W) 'lib1594.c'; else $(CYGPATH_W) '$(srcdir)/lib1594.c'; fi` + +lib1596-first.o: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-first.o -MD -MP -MF $(DEPDIR)/lib1596-first.Tpo -c -o lib1596-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-first.Tpo $(DEPDIR)/lib1596-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1596-first.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-first.o `test -f 'first.c' || echo '$(srcdir)/'`first.c + +lib1596-first.obj: first.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-first.obj -MD -MP -MF $(DEPDIR)/lib1596-first.Tpo -c -o lib1596-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-first.Tpo $(DEPDIR)/lib1596-first.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='first.c' object='lib1596-first.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-first.obj `if test -f 'first.c'; then $(CYGPATH_W) 'first.c'; else $(CYGPATH_W) '$(srcdir)/first.c'; fi` + +lib1596-testutil.o: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-testutil.o -MD -MP -MF $(DEPDIR)/lib1596-testutil.Tpo -c -o lib1596-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-testutil.Tpo $(DEPDIR)/lib1596-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1596-testutil.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-testutil.o `test -f 'testutil.c' || echo '$(srcdir)/'`testutil.c + +lib1596-testutil.obj: testutil.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1596-testutil.obj -MD -MP -MF $(DEPDIR)/lib1596-testutil.Tpo -c -o lib1596-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1596-testutil.Tpo $(DEPDIR)/lib1596-testutil.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='testutil.c' object='lib1596-testutil.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lib1596-testutil.obj `if test -f 'testutil.c'; then $(CYGPATH_W) 'testutil.c'; else $(CYGPATH_W) '$(srcdir)/testutil.c'; fi` + +../../lib/lib1596-warnless.o: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1596-warnless.o -MD -MP -MF ../../lib/$(DEPDIR)/lib1596-warnless.Tpo -c -o ../../lib/lib1596-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1596-warnless.Tpo ../../lib/$(DEPDIR)/lib1596-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1596-warnless.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1596-warnless.o `test -f '../../lib/warnless.c' || echo '$(srcdir)/'`../../lib/warnless.c + +../../lib/lib1596-warnless.obj: ../../lib/warnless.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT ../../lib/lib1596-warnless.obj -MD -MP -MF ../../lib/$(DEPDIR)/lib1596-warnless.Tpo -c -o ../../lib/lib1596-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) ../../lib/$(DEPDIR)/lib1596-warnless.Tpo ../../lib/$(DEPDIR)/lib1596-warnless.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='../../lib/warnless.c' object='../../lib/lib1596-warnless.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1596_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o ../../lib/lib1596-warnless.obj `if test -f '../../lib/warnless.c'; then $(CYGPATH_W) '../../lib/warnless.c'; else $(CYGPATH_W) '$(srcdir)/../../lib/warnless.c'; fi` + lib1900-lib1900.o: lib1900.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lib1900_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lib1900-lib1900.o -MD -MP -MF $(DEPDIR)/lib1900-lib1900.Tpo -c -o lib1900-lib1900.o `test -f 'lib1900.c' || echo '$(srcdir)/'`lib1900.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lib1900-lib1900.Tpo $(DEPDIR)/lib1900-lib1900.Po @@ -9760,6 +9856,7 @@ distclean: distclean-am -rm -f ../../lib/$(DEPDIR)/lib1557-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1591-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1592-warnless.Po + -rm -f ../../lib/$(DEPDIR)/lib1596-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1900-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1905-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1906-warnless.Po @@ -9938,6 +10035,10 @@ distclean: distclean-am -rm -f ./$(DEPDIR)/lib1592-lib1592.Po -rm -f ./$(DEPDIR)/lib1592-testutil.Po -rm -f ./$(DEPDIR)/lib1593.Po + -rm -f ./$(DEPDIR)/lib1594.Po + -rm -f ./$(DEPDIR)/lib1596-first.Po + -rm -f ./$(DEPDIR)/lib1596-lib1594.Po + -rm -f ./$(DEPDIR)/lib1596-testutil.Po -rm -f ./$(DEPDIR)/lib1900-first.Po -rm -f ./$(DEPDIR)/lib1900-lib1900.Po -rm -f ./$(DEPDIR)/lib1900-testutil.Po @@ -10248,6 +10349,7 @@ maintainer-clean: maintainer-clean-am -rm -f ../../lib/$(DEPDIR)/lib1557-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1591-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1592-warnless.Po + -rm -f ../../lib/$(DEPDIR)/lib1596-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1900-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1905-warnless.Po -rm -f ../../lib/$(DEPDIR)/lib1906-warnless.Po @@ -10426,6 +10528,10 @@ maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/lib1592-lib1592.Po -rm -f ./$(DEPDIR)/lib1592-testutil.Po -rm -f ./$(DEPDIR)/lib1593.Po + -rm -f ./$(DEPDIR)/lib1594.Po + -rm -f ./$(DEPDIR)/lib1596-first.Po + -rm -f ./$(DEPDIR)/lib1596-lib1594.Po + -rm -f ./$(DEPDIR)/lib1596-testutil.Po -rm -f ./$(DEPDIR)/lib1900-first.Po -rm -f ./$(DEPDIR)/lib1900-lib1900.Po -rm -f ./$(DEPDIR)/lib1900-testutil.Po diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index f5effd97..4ea9cf2a 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -32,7 +32,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib1540 lib1541 \ lib1550 lib1551 lib1552 lib1553 lib1554 lib1555 lib1556 lib1557 \ lib1558 lib1559 lib1560 \ - lib1591 lib1592 lib1593 \ + lib1591 lib1592 lib1593 lib1594 lib1596 \ lib1900 lib1905 lib1906 \ lib2033 @@ -544,6 +544,13 @@ lib1592_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1592 lib1593_SOURCES = lib1593.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1593_LDADD = $(TESTUTIL_LIBS) +lib1594_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1594_LDADD = $(TESTUTIL_LIBS) + +lib1596_SOURCES = lib1594.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) +lib1596_LDADD = $(TESTUTIL_LIBS) +lib1596_CPPFLAGS = $(AM_CPPFLAGS) -DLIB1596 + lib1900_SOURCES = lib1900.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib1900_LDADD = $(TESTUTIL_LIBS) lib1900_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/first.c b/tests/libtest/first.c index d687bf27..2731ef8d 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -97,9 +97,9 @@ static void memory_tracking_init(void) strcpy(fname, env); curl_free(env); curl_dbg_memdebug(fname); - /* this weird stuff here is to make curl_free() get called - before curl_memdebug() as otherwise memory tracking will - log a free() without an alloc! */ + /* this weird stuff here is to make curl_free() get called before + curl_dbg_memdebug() as otherwise memory tracking will log a free() + without an alloc! */ } /* if CURL_MEMLIMIT is set, this enables fail-on-alloc-number-N feature */ env = curl_getenv("CURL_MEMLIMIT"); diff --git a/tests/libtest/lib1560.c b/tests/libtest/lib1560.c index 1185096d..85884474 100644 --- a/tests/libtest/lib1560.c +++ b/tests/libtest/lib1560.c @@ -140,6 +140,10 @@ static struct testcase get_parts_list[] ={ "file | [11] | [12] | [13] | [14] | [15] | C:\\programs\\foo | [16] | [17]", CURLU_DEFAULT_SCHEME, 0, CURLUE_OK}, #endif + {"http://[ab.be:1]/x", "", + CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT}, + {"http://[ab.be]/x", "", + CURLU_DEFAULT_SCHEME, 0, CURLUE_MALFORMED_INPUT}, /* URL without host name */ {"http://a:b@/x", "", CURLU_DEFAULT_SCHEME, 0, CURLUE_NO_HOST}, diff --git a/tests/libtest/lib1594.c b/tests/libtest/lib1594.c new file mode 100644 index 00000000..a7697159 --- /dev/null +++ b/tests/libtest/lib1594.c @@ -0,0 +1,66 @@ +/*************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at https://curl.haxx.se/docs/copyright.html. + * + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the COPYING file. + * + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. + * + ***************************************************************************/ + +/* Testing Retry-After header parser */ + +#include "test.h" + +#include "memdebug.h" + +int test(char *URL) +{ + struct curl_slist *header = NULL; + curl_off_t retry; + CURL *curl = NULL; + int res = 0; + + global_init(CURL_GLOBAL_ALL); + + easy_init(curl); + + easy_setopt(curl, CURLOPT_URL, URL); + + res = curl_easy_perform(curl); + if(res) + goto test_cleanup; + + res = curl_easy_getinfo(curl, CURLINFO_RETRY_AFTER, &retry); + if(res) + goto test_cleanup; + +#ifdef LIB1596 + /* we get a relative number of seconds, so add the number of seconds + we're at to make it a somewhat stable number. Then remove accuracy. */ + retry += time(NULL); + retry /= 10000; +#endif + printf("Retry-After: %" CURL_FORMAT_CURL_OFF_T "\n", retry); + +test_cleanup: + + /* always cleanup */ + curl_easy_cleanup(curl); + curl_slist_free_all(header); + curl_global_cleanup(); + + return res; +} diff --git a/tests/runtests.1 b/tests/runtests.1 index afc33186..58d441b8 100644 --- a/tests/runtests.1 +++ b/tests/runtests.1 @@ -20,7 +20,7 @@ .\" * .\" ************************************************************************** .\" -.TH runtests.pl 1 "May 05, 2017" "Curl 7.65.3" "runtests" +.TH runtests.pl 1 "May 05, 2017" "Curl 7.66.0" "runtests" .SH NAME runtests.pl \- run one or more test cases diff --git a/tests/server/Makefile.in b/tests/server/Makefile.in index 3d9ab43d..2bf0e5dc 100644 --- a/tests/server/Makefile.in +++ b/tests/server/Makefile.in @@ -535,8 +535,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ diff --git a/tests/symbol-scan.pl b/tests/symbol-scan.pl index 6706aa70..1379299d 100755 --- a/tests/symbol-scan.pl +++ b/tests/symbol-scan.pl @@ -119,11 +119,13 @@ for my $e (sort @syms) { # CURL_EXTERN - is a define used for libcurl functions that are external, # public. No app or other code should ever use it. # + # CURLINC_ - defines for header dual-include prevention, ignore those. + # # *_LAST and *_LASTENTRY are just prefix for the placeholders used for the # last entry in many enum series. # - if($e =~ /(OBSOLETE|^CURL_EXTERN|_LAST\z|_LASTENTRY\z)/) { + if($e =~ /(OBSOLETE|^CURL_EXTERN|^CURLINC_|_LAST\z|_LASTENTRY\z)/) { $ignored++; next; } diff --git a/tests/testcurl.1 b/tests/testcurl.1 index f5b52eef..561b77a2 100644 --- a/tests/testcurl.1 +++ b/tests/testcurl.1 @@ -20,7 +20,7 @@ .\" * .\" ************************************************************************** .\" -.TH testcurl.pl 1 "October 22, 2016" "Curl 7.65.3" "testcurl" +.TH testcurl.pl 1 "October 22, 2016" "Curl 7.66.0" "testcurl" .SH NAME testcurl.pl \- (automatically) test curl diff --git a/tests/unit/Makefile.in b/tests/unit/Makefile.in index bc8f05c1..5bd06fb5 100644 --- a/tests/unit/Makefile.in +++ b/tests/unit/Makefile.in @@ -628,8 +628,12 @@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ USE_MESALINK = @USE_MESALINK@ USE_NGHTTP2 = @USE_NGHTTP2@ +USE_NGHTTP3 = @USE_NGHTTP3@ +USE_NGTCP2 = @USE_NGTCP2@ +USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ +USE_QUICHE = @USE_QUICHE@ USE_SCHANNEL = @USE_SCHANNEL@ USE_SECTRANSP = @USE_SECTRANSP@ USE_UNIX_SOCKETS = @USE_UNIX_SOCKETS@ diff --git a/tests/unit/unit1607.c b/tests/unit/unit1607.c index 6e40be70..a8b0331c 100644 --- a/tests/unit/unit1607.c +++ b/tests/unit/unit1607.c @@ -25,10 +25,6 @@ #include "connect.h" #include "share.h" -/* retrieves ip address and port from a sockaddr structure. - note it calls Curl_inet_ntop which sets errno on fail, not SOCKERRNO. */ -bool getaddressinfo(struct sockaddr *sa, char *addr, long *port); - #include "memdebug.h" /* LAST include file */ static void unit_stop(void) @@ -154,8 +150,8 @@ UNITTEST_START if(tests[i].address[j] == &skip) continue; - if(addr && !getaddressinfo(addr->ai_addr, - ipaddress, &port)) { + if(addr && !Curl_addr2string(addr->ai_addr, addr->ai_addrlen, + ipaddress, &port)) { fprintf(stderr, "%s:%d tests[%d] failed. getaddressinfo failed.\n", __FILE__, __LINE__, i); problem = true; diff --git a/tests/unit/unit1609.c b/tests/unit/unit1609.c index 8d9bc652..8223a147 100644 --- a/tests/unit/unit1609.c +++ b/tests/unit/unit1609.c @@ -25,10 +25,6 @@ #include "connect.h" #include "share.h" -/* retrieves ip address and port from a sockaddr structure. - note it calls Curl_inet_ntop which sets errno on fail, not SOCKERRNO. */ -bool getaddressinfo(struct sockaddr *sa, char *addr, long *port); - #include "memdebug.h" /* LAST include file */ static void unit_stop(void) @@ -154,9 +150,9 @@ UNITTEST_START if(!addr && !tests[i].address[j]) break; - if(addr && !getaddressinfo(addr->ai_addr, - ipaddress, &port)) { - fprintf(stderr, "%s:%d tests[%d] failed. getaddressinfo failed.\n", + if(addr && !Curl_addr2string(addr->ai_addr, addr->ai_addrlen, + ipaddress, &port)) { + fprintf(stderr, "%s:%d tests[%d] failed. Curl_addr2string failed.\n", __FILE__, __LINE__, i); problem = true; break; diff --git a/tests/unit/unit1654.c b/tests/unit/unit1654.c index 9d1a3e21..51fc5d16 100644 --- a/tests/unit/unit1654.c +++ b/tests/unit/unit1654.c @@ -90,7 +90,7 @@ UNITTEST_START fail_unless(asi->num == 8, "wrong number of entries"); result = Curl_altsvc_parse(curl, asi, "h2=\"example.com:443\"; ma = 120;", - ALPN_h2c, "example.org", 80); + ALPN_h2, "example.org", 80); if(result) { fprintf(stderr, "Curl_altsvc_parse(4) failed!\n"); unitfail++; |