Merge pull request #3103 from AndrzejKurek/ssl-read-improve-ret-code-doc
ssl - improve documentation on mbedtls_ssl_read and PEER_CLOSE_NOTIFY
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index b0b09cd..2ceb3f6 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -840,6 +840,7 @@
for( cur = list; cur != NULL; cur = cur->next )
{
+ flags = 0;
MBEDTLS_SSL_DEBUG_CRT( 3, "candidate certificate chain, certificate",
cur->cert );
diff --git a/scripts/output_env.sh b/scripts/output_env.sh
index 0e06794..04edc38 100755
--- a/scripts/output_env.sh
+++ b/scripts/output_env.sh
@@ -105,7 +105,16 @@
print_version "python" "--version" "" "head -n 1"
echo
-print_version "pylint3" "--version" "" "sed /^.*config/d" "grep pylint"
+# Find the installed version of Pylint. Installed as a distro package this can
+# be pylint3 and as a PEP egg, pylint. In test scripts We prefer pylint over
+# pylint3
+if type pylint >/dev/null 2>/dev/null; then
+ print_version "pylint" "--version" "" "sed /^.*config/d" "grep pylint"
+elif type pylint3 >/dev/null 2>/dev/null; then
+ print_version "pylint3" "--version" "" "sed /^.*config/d" "grep pylint"
+else
+ echo " * pylint or pylint3: Not found."
+fi
echo
: ${OPENSSL:=openssl}
diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh
index 25bf425..7abc395 100755
--- a/tests/scripts/all.sh
+++ b/tests/scripts/all.sh
@@ -1595,7 +1595,13 @@
}
support_check_python_files () {
- type pylint3 >/dev/null 2>/dev/null
+ # Find the installed version of Pylint. Installed as a distro package this can
+ # be pylint3 and as a PEP egg, pylint.
+ if type pylint >/dev/null 2>/dev/null || type pylint3 >/dev/null 2>/dev/null; then
+ true;
+ else
+ false;
+ fi
}
component_check_python_files () {
msg "Lint: Python scripts"
diff --git a/tests/scripts/check-python-files.sh b/tests/scripts/check-python-files.sh
index 9290418..6b864d2 100755
--- a/tests/scripts/check-python-files.sh
+++ b/tests/scripts/check-python-files.sh
@@ -9,4 +9,15 @@
# Run 'pylint' on Python files for programming errors and helps enforcing
# PEP8 coding standards.
-pylint3 -j 2 scripts/*.py tests/scripts/*.py
+# Find the installed version of Pylint. Installed as a distro package this can
+# be pylint3 and as a PEP egg, pylint. We prefer pylint over pylint3
+if type pylint >/dev/null 2>/dev/null; then
+ PYLINT=pylint
+elif type pylint3 >/dev/null 2>/dev/null; then
+ PYLINT=pylint3
+else
+ echo 'Pylint was not found.'
+ exit 1
+fi
+
+$PYLINT -j 2 scripts/*.py tests/scripts/*.py
