tidy-up: whitespace [ci skip]
This commit is contained in:
parent
3774b8a9a7
commit
f81f60206d
@ -476,4 +476,3 @@ and then re-use that in another invocation.
|
|||||||
|
|
||||||
Both our OpenSSL fork and boringssl have APIs for both controlling GREASE and
|
Both our OpenSSL fork and boringssl have APIs for both controlling GREASE and
|
||||||
accessing and logging ``retry_configs``, it seems WolfSSL has neither.
|
accessing and logging ``retry_configs``, it seems WolfSSL has neither.
|
||||||
|
|
||||||
|
|||||||
@ -27,16 +27,16 @@
|
|||||||
# Python3 program to print all combination of size r in an array of size n.
|
# Python3 program to print all combination of size r in an array of size n.
|
||||||
# This is used to generate test lines in tests/ech_test.sh.
|
# This is used to generate test lines in tests/ech_test.sh.
|
||||||
# This will be discarded in the process of moving from experimental,
|
# This will be discarded in the process of moving from experimental,
|
||||||
# but is worth preserving for the moment in case of changes to the
|
# but is worth preserving for the moment in case of changes to the
|
||||||
# ECH command line args
|
# ECH command line args
|
||||||
|
|
||||||
def CombinationRepetitionUtil(chosen, arr, badarr, index,
|
def CombinationRepetitionUtil(chosen, arr, badarr, index,
|
||||||
r, start, end):
|
r, start, end):
|
||||||
|
|
||||||
# Current combination is ready,
|
# Current combination is ready,
|
||||||
# print it
|
# print it
|
||||||
if index == r:
|
if index == r:
|
||||||
# figure out if result should be good or bad and
|
# figure out if result should be good or bad and
|
||||||
# print prefix, assuming $turl does support ECH so
|
# print prefix, assuming $turl does support ECH so
|
||||||
# should work if given "positive" parameters
|
# should work if given "positive" parameters
|
||||||
res = 1
|
res = 1
|
||||||
@ -51,19 +51,19 @@ def CombinationRepetitionUtil(chosen, arr, badarr, index,
|
|||||||
for j in range(r):
|
for j in range(r):
|
||||||
if j != 0 and chosen[j] != chosen[j-1]:
|
if j != 0 and chosen[j] != chosen[j-1]:
|
||||||
print(chosen[j], end = " ")
|
print(chosen[j], end = " ")
|
||||||
|
|
||||||
print()
|
print()
|
||||||
return
|
return
|
||||||
|
|
||||||
# When no more elements are
|
# When no more elements are
|
||||||
# there to put in chosen[]
|
# there to put in chosen[]
|
||||||
if start > n:
|
if start > n:
|
||||||
return
|
return
|
||||||
|
|
||||||
# Current is included, put
|
# Current is included, put
|
||||||
# next at next location
|
# next at next location
|
||||||
chosen[index] = arr[start]
|
chosen[index] = arr[start]
|
||||||
|
|
||||||
# Current is excluded, replace it
|
# Current is excluded, replace it
|
||||||
# with next (Note that i+1 is passed,
|
# with next (Note that i+1 is passed,
|
||||||
# but index is not changed)
|
# but index is not changed)
|
||||||
@ -77,7 +77,7 @@ def CombinationRepetitionUtil(chosen, arr, badarr, index,
|
|||||||
# size n. This function mainly uses
|
# size n. This function mainly uses
|
||||||
# CombinationRepetitionUtil()
|
# CombinationRepetitionUtil()
|
||||||
def CombinationRepetition(arr, badarr, n, r):
|
def CombinationRepetition(arr, badarr, n, r):
|
||||||
|
|
||||||
# A temporary array to store
|
# A temporary array to store
|
||||||
# all combination one by one
|
# all combination one by one
|
||||||
chosen = [0] * r
|
chosen = [0] * r
|
||||||
@ -96,4 +96,3 @@ n = len(arr) - 1
|
|||||||
CombinationRepetition(arr, badarr, n, r)
|
CombinationRepetition(arr, badarr, n, r)
|
||||||
|
|
||||||
# This code is contributed by Vaibhav Kumar 12.
|
# This code is contributed by Vaibhav Kumar 12.
|
||||||
|
|
||||||
|
|||||||
@ -356,7 +356,7 @@ then
|
|||||||
# basic ECH good/bad
|
# basic ECH good/bad
|
||||||
for targ in "${!ech_targets[@]}"
|
for targ in "${!ech_targets[@]}"
|
||||||
do
|
do
|
||||||
if [[ "$using_wolf" == "yes" ]]
|
if [[ "$using_wolf" == "yes" ]]
|
||||||
then
|
then
|
||||||
case $targ in
|
case $targ in
|
||||||
"draft-13.esni.defo.ie:8414" | "tls-ech.dev" | \
|
"draft-13.esni.defo.ie:8414" | "tls-ech.dev" | \
|
||||||
@ -376,7 +376,7 @@ do
|
|||||||
path=${ech_targets[$targ]}
|
path=${ech_targets[$targ]}
|
||||||
turl="https://$host:$port/$path"
|
turl="https://$host:$port/$path"
|
||||||
echo "ECH check for $turl"
|
echo "ECH check for $turl"
|
||||||
{
|
{
|
||||||
echo ""
|
echo ""
|
||||||
echo "ECH check for $turl"
|
echo "ECH check for $turl"
|
||||||
} >> "$logfile"
|
} >> "$logfile"
|
||||||
@ -415,7 +415,7 @@ then
|
|||||||
path=${ech_targets[$targ]}
|
path=${ech_targets[$targ]}
|
||||||
turl="https://$host:$port/$path"
|
turl="https://$host:$port/$path"
|
||||||
echo "PN override check for $turl"
|
echo "PN override check for $turl"
|
||||||
{
|
{
|
||||||
echo ""
|
echo ""
|
||||||
echo "PN override check for $turl"
|
echo "PN override check for $turl"
|
||||||
} >> "$logfile"
|
} >> "$logfile"
|
||||||
@ -553,7 +553,7 @@ then
|
|||||||
echo "more cli_test with $turl" >> "$logfile"
|
echo "more cli_test with $turl" >> "$logfile"
|
||||||
|
|
||||||
# The combinatorics here are handled via the tests/ech_combos.py script
|
# The combinatorics here are handled via the tests/ech_combos.py script
|
||||||
# which produces all the relevant combinations or inputs and orders
|
# which produces all the relevant combinations or inputs and orders
|
||||||
# thereof. We have to manually assess whether or not ECH is expected to
|
# thereof. We have to manually assess whether or not ECH is expected to
|
||||||
# work for each case.
|
# work for each case.
|
||||||
cli_test "$turl" 0 0
|
cli_test "$turl" 0 0
|
||||||
@ -1148,4 +1148,3 @@ fi
|
|||||||
# add to list of bad runs (updating file age)
|
# add to list of bad runs (updating file age)
|
||||||
echo "ECH badness at $NOW" >>"$LTOP"/bad_runs
|
echo "ECH badness at $NOW" >>"$LTOP"/bad_runs
|
||||||
exit 2
|
exit 2
|
||||||
|
|
||||||
|
|||||||
@ -97,5 +97,3 @@ class TestBasic:
|
|||||||
r.check_stats(http_status=200, count=1)
|
r.check_stats(http_status=200, count=1)
|
||||||
assert r.stats[0]['time_connect'] > 0, f'{r.stats[0]}'
|
assert r.stats[0]['time_connect'] > 0, f'{r.stats[0]}'
|
||||||
assert r.stats[0]['time_appconnect'] > 0, f'{r.stats[0]}'
|
assert r.stats[0]['time_appconnect'] > 0, f'{r.stats[0]}'
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -495,4 +495,3 @@ class TestDownload:
|
|||||||
r.check_exit_code(0)
|
r.check_exit_code(0)
|
||||||
srcfile = os.path.join(httpd.docs_dir, docname)
|
srcfile = os.path.join(httpd.docs_dir, docname)
|
||||||
self.check_downloads(client, srcfile, count)
|
self.check_downloads(client, srcfile, count)
|
||||||
|
|
||||||
|
|||||||
@ -134,4 +134,3 @@ class TestErrors:
|
|||||||
else:
|
else:
|
||||||
r.check_exit_code(0)
|
r.check_exit_code(0)
|
||||||
r.check_response(http_status=200, count=count)
|
r.check_response(http_status=200, count=count)
|
||||||
|
|
||||||
|
|||||||
@ -542,4 +542,3 @@ class TestUpload:
|
|||||||
'--expect100-timeout', f'{read_delay-1}'
|
'--expect100-timeout', f'{read_delay-1}'
|
||||||
])
|
])
|
||||||
r.check_stats(count=1, http_status=200, exitcode=0)
|
r.check_stats(count=1, http_status=200, exitcode=0)
|
||||||
|
|
||||||
|
|||||||
@ -368,4 +368,3 @@ class TestProxy:
|
|||||||
else:
|
else:
|
||||||
r.check_response(count=1, http_status=200,
|
r.check_response(count=1, http_status=200,
|
||||||
protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
|
protocol='HTTP/2' if proto == 'h2' else 'HTTP/1.1')
|
||||||
|
|
||||||
|
|||||||
@ -159,4 +159,4 @@ class TestInfo:
|
|||||||
f'greater than "time_starttransfer", {s}'
|
f'greater than "time_starttransfer", {s}'
|
||||||
# assert that transfer start is before total
|
# assert that transfer start is before total
|
||||||
assert s['time_starttransfer'] <= s['time_total'], f'"time_starttransfer" '\
|
assert s['time_starttransfer'] <= s['time_total'], f'"time_starttransfer" '\
|
||||||
f'greater than "time_total", {s}'
|
f'greater than "time_total", {s}'
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user