mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-30 02:34:20 +01:00
825ebd483f
Conflicts:
mbedtls.doxyfile - PROJECT_NAME - mbed TLS v2.16.6 chosen.
doc_mainpage.h - mbed TLS v2.16.6 version chosen.
hmac_drbg.h - line 260, extended description chosen.
- line 313, extended description chosen.
- line 338, extended description chosen.
version.h - 2.16.6 chosen.
CMakeLists.txt - 2.16.6 chosen.
test_suite_version.data - 2.16.6 chosen.
Makefile - 141 - manual correction - baremetal version of C_SOURCE_FILES
with variables for directories plus 2.16.6 CTAGS addition.
pkparse.c - lines 846 onwards - the asn1_get_nonzero_mpi implementation chosen.
ssl_tls.c - line 5269 - edited manually, left the ret=0, because baremetal has
a different behaviour since commit 87b5626
, but added a debug
message that's new in 2.16.6.
all.sh:
- component_build_deprecated - chosen the refactored version from 2.16.6,
but with extra flags from baremetal.
- rest of the _no_xxx tests - merged make options to have PTHREAD=1 and
other changes from 2.16.6 (like -O1 instead of -O0).
- component_build_arm_none_eabi_gcc_no_64bit_multiplication - added
TINYCRYPT_BUILD=0 to the 2.16.6 version of make.
x509/req_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/crl_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
x509/cert_app.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_mail_client.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_pthread_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl/ssl_fork_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client1.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_client2.c - line 54 - left baremetal log but with mbedtls_exit( 0 ) call.
- line 132 - new options of both branches added.
- skip close notify handled as in 2.16.6, but with `ssl` instead of `&ssl`.
- Merged the 2.16.6 usage split with additional baremetal usages.
- Merged options from baremetal and 2.16.6.
ssl_server.c - left baremetal log but with mbedtls_exit( 0 ) call.
ssl_server2.c - Merged the 2.16.6 usage split with additional baremetal usages.
config.pl - fixed missing defines from the documentation, removed duplicates,
and reorganised so that the documentation and excluded list
are ordered in the same way.
test_suite_x509parse.data - only added the two new pathlen tests.
x509_crt.c - change the return code by removing
MBEDTLS_ERR_X509_INVALID_EXTENSIONS, since it's added by
x509_crt_frame_parse_ext not by an "or", but by "+=".
Changelog - Assigned all entries to appropriate sections.
ssl-opt.sh - line 8263 - merged options.
- removed lines 1165 - 1176 - there was a duplicate test, probably
an artifact of previous merges.
check-files.py - sticked to old formatting.
Signed-off-by: Andrzej Kurek <andrzej.kurek@arm.com>
172 lines
3.7 KiB
Bash
Executable File
172 lines
3.7 KiB
Bash
Executable File
#! /usr/bin/env sh
|
|
|
|
# output_env.sh
|
|
#
|
|
# This file is part of mbed TLS (https://tls.mbed.org)
|
|
#
|
|
# Copyright (c) 2016, ARM Limited, All Rights Reserved
|
|
#
|
|
# Purpose
|
|
#
|
|
# To print out all the relevant information about the development environment.
|
|
#
|
|
# This includes:
|
|
# - architecture of the system
|
|
# - type and version of the operating system
|
|
# - version of armcc, clang, gcc-arm and gcc compilers
|
|
# - version of libc, clang, asan and valgrind if installed
|
|
# - version of gnuTLS and OpenSSL
|
|
|
|
print_version()
|
|
{
|
|
BIN="$1"
|
|
shift
|
|
ARGS="$1"
|
|
shift
|
|
VARIANT="$1"
|
|
shift
|
|
|
|
if [ -n "$VARIANT" ]; then
|
|
VARIANT=" ($VARIANT)"
|
|
fi
|
|
|
|
if ! type "$BIN" > /dev/null 2>&1; then
|
|
echo " * ${BIN##*/}$VARIANT: Not found."
|
|
return 0
|
|
fi
|
|
|
|
BIN=`which "$BIN"`
|
|
VERSION_STR=`$BIN $ARGS 2>&1`
|
|
|
|
# Apply all filters
|
|
while [ $# -gt 0 ]; do
|
|
FILTER="$1"
|
|
shift
|
|
VERSION_STR=`echo "$VERSION_STR" | $FILTER`
|
|
done
|
|
|
|
if [ -z "$VERSION_STR" ]; then
|
|
VERSION_STR="Version could not be determined."
|
|
fi
|
|
|
|
echo " * ${BIN##*/}$VARIANT: ${BIN} : ${VERSION_STR} "
|
|
}
|
|
|
|
echo "** Platform:"
|
|
echo
|
|
|
|
if [ `uname -s` = "Linux" ]; then
|
|
echo "Linux variant"
|
|
lsb_release -d -c
|
|
else
|
|
echo "Unknown Unix variant"
|
|
fi
|
|
|
|
echo
|
|
|
|
print_version "uname" "-a" ""
|
|
|
|
echo
|
|
echo
|
|
echo "** Tool Versions:"
|
|
echo
|
|
|
|
if [ "${RUN_ARMCC:-1}" -ne 0 ]; then
|
|
: "${ARMC5_CC:=armcc}"
|
|
print_version "$ARMC5_CC" "--vsn" "" "head -n 2"
|
|
echo
|
|
|
|
: "${ARMC6_CC:=armclang}"
|
|
print_version "$ARMC6_CC" "--vsn" "" "head -n 2"
|
|
echo
|
|
fi
|
|
|
|
print_version "arm-none-eabi-gcc" "--version" "" "head -n 1"
|
|
echo
|
|
|
|
print_version "gcc" "--version" "" "head -n 1"
|
|
echo
|
|
|
|
print_version "clang" "--version" "" "head -n 2"
|
|
echo
|
|
|
|
print_version "ldd" "--version" "" "head -n 1"
|
|
echo
|
|
|
|
print_version "valgrind" "--version" ""
|
|
echo
|
|
|
|
print_version "gdb" "--version" "" "head -n 1"
|
|
echo
|
|
|
|
print_version "perl" "--version" "" "head -n 2" "grep ."
|
|
echo
|
|
|
|
print_version "python" "--version" "" "head -n 1"
|
|
echo
|
|
|
|
# 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}
|
|
print_version "$OPENSSL" "version" "default"
|
|
echo
|
|
|
|
if [ -n "${OPENSSL_LEGACY+set}" ]; then
|
|
print_version "$OPENSSL_LEGACY" "version" "legacy"
|
|
else
|
|
echo " * openssl (legacy): Not configured."
|
|
fi
|
|
echo
|
|
|
|
if [ -n "${OPENSSL_NEXT+set}" ]; then
|
|
print_version "$OPENSSL_NEXT" "version" "next"
|
|
else
|
|
echo " * openssl (next): Not configured."
|
|
fi
|
|
echo
|
|
|
|
: ${GNUTLS_CLI:=gnutls-cli}
|
|
print_version "$GNUTLS_CLI" "--version" "default" "head -n 1"
|
|
echo
|
|
|
|
: ${GNUTLS_SERV:=gnutls-serv}
|
|
print_version "$GNUTLS_SERV" "--version" "default" "head -n 1"
|
|
echo
|
|
|
|
if [ -n "${GNUTLS_LEGACY_CLI+set}" ]; then
|
|
print_version "$GNUTLS_LEGACY_CLI" "--version" "legacy" "head -n 1"
|
|
else
|
|
echo " * gnutls-cli (legacy): Not configured."
|
|
fi
|
|
echo
|
|
|
|
if [ -n "${GNUTLS_LEGACY_SERV+set}" ]; then
|
|
print_version "$GNUTLS_LEGACY_SERV" "--version" "legacy" "head -n 1"
|
|
else
|
|
echo " * gnutls-serv (legacy): Not configured."
|
|
fi
|
|
echo
|
|
|
|
echo " * Installed asan versions:"
|
|
if type dpkg-query >/dev/null 2>/dev/null; then
|
|
if ! dpkg-query -f '${Status} ${Package}: ${Version}\n' -W 'libasan*' |
|
|
awk '$3 == "installed" && $4 !~ /-/ {print $4, $5}' |
|
|
grep .
|
|
then
|
|
echo " No asan versions installed."
|
|
fi
|
|
else
|
|
echo " Unable to determine the asan version without dpkg."
|
|
fi
|
|
echo
|