mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-03-04 10:09:50 +00: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>
113 lines
3.3 KiB
C
113 lines
3.3 KiB
C
/**
|
|
* \file version.h
|
|
*
|
|
* \brief Run-time version information
|
|
*/
|
|
/*
|
|
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
* not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*
|
|
* This file is part of mbed TLS (https://tls.mbed.org)
|
|
*/
|
|
/*
|
|
* This set of compile-time defines and run-time variables can be used to
|
|
* determine the version number of the mbed TLS library used.
|
|
*/
|
|
#ifndef MBEDTLS_VERSION_H
|
|
#define MBEDTLS_VERSION_H
|
|
|
|
#if !defined(MBEDTLS_CONFIG_FILE)
|
|
#include "config.h"
|
|
#else
|
|
#include MBEDTLS_CONFIG_FILE
|
|
#endif
|
|
|
|
/**
|
|
* The version number x.y.z is split into three parts.
|
|
* Major, Minor, Patchlevel
|
|
*/
|
|
#define MBEDTLS_VERSION_MAJOR 2
|
|
#define MBEDTLS_VERSION_MINOR 16
|
|
#define MBEDTLS_VERSION_PATCH 6
|
|
|
|
/**
|
|
* The single version number has the following structure:
|
|
* MMNNPP00
|
|
* Major version | Minor version | Patch version
|
|
*/
|
|
#define MBEDTLS_VERSION_NUMBER 0x02100600
|
|
#define MBEDTLS_VERSION_STRING "2.16.6"
|
|
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.16.6"
|
|
|
|
#if defined(MBEDTLS_VERSION_C)
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/**
|
|
* Get the version number.
|
|
*
|
|
* \return The constructed version number in the format
|
|
* MMNNPP00 (Major, Minor, Patch).
|
|
*/
|
|
unsigned int mbedtls_version_get_number( void );
|
|
|
|
/**
|
|
* Get the version string ("x.y.z").
|
|
*
|
|
* \param string The string that will receive the value.
|
|
* (Should be at least 9 bytes in size)
|
|
*/
|
|
void mbedtls_version_get_string( char *string );
|
|
|
|
/**
|
|
* Get the full version string ("mbed TLS x.y.z").
|
|
*
|
|
* \param string The string that will receive the value. The mbed TLS version
|
|
* string will use 18 bytes AT MOST including a terminating
|
|
* null byte.
|
|
* (So the buffer should be at least 18 bytes to receive this
|
|
* version string).
|
|
*/
|
|
void mbedtls_version_get_string_full( char *string );
|
|
|
|
/**
|
|
* \brief Check if support for a feature was compiled into this
|
|
* mbed TLS binary. This allows you to see at runtime if the
|
|
* library was for instance compiled with or without
|
|
* Multi-threading support.
|
|
*
|
|
* \note only checks against defines in the sections "System
|
|
* support", "mbed TLS modules" and "mbed TLS feature
|
|
* support" in config.h
|
|
*
|
|
* \param feature The string for the define to check (e.g. "MBEDTLS_AES_C")
|
|
*
|
|
* \return 0 if the feature is present,
|
|
* -1 if the feature is not present and
|
|
* -2 if support for feature checking as a whole was not
|
|
* compiled in.
|
|
*/
|
|
int mbedtls_version_check_feature( const char *feature );
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* MBEDTLS_VERSION_C */
|
|
|
|
#endif /* version.h */
|