eden-emu/mbedtls
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Extend setup_and_run script to cover remaining configurations.

Browse source 
Signed-off-by: Mateusz Starzyk <mateusz.starzyk@mobica.com>
This commit is contained in:
Mateusz Starzyk 2021-06-07 11:08:01 +02:00
parent 854a25c7a4
commit 2abe51cc75
7 changed files with 31 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/ecdh.h
View file

@ -134,8 +134,8 @@ typedef struct mbedtls_ecdh_context
mbedtls_ecp_point MBEDTLS_PRIVATE(Vf); /*!< The unblinding value. */ mbedtls_ecp_point MBEDTLS_PRIVATE(Vf); /*!< The unblinding value. */
mbedtls_mpi MBEDTLS_PRIVATE(_d); /*!< The previous \p d. */ mbedtls_mpi MBEDTLS_PRIVATE(_d); /*!< The previous \p d. */
#if defined(MBEDTLS_ECP_RESTARTABLE) #if defined(MBEDTLS_ECP_RESTARTABLE)
int restart_enabled; /*!< The flag for restartable mode. */ int MBEDTLS_PRIVATE(restart_enabled); /*!< The flag for restartable mode. */
mbedtls_ecp_restart_ctx rs; /*!< The restart context for EC computations. */ mbedtls_ecp_restart_ctx MBEDTLS_PRIVATE(rs); /*!< The restart context for EC computations. */
#endif /* MBEDTLS_ECP_RESTARTABLE */ #endif /* MBEDTLS_ECP_RESTARTABLE */
#else #else
uint8_t MBEDTLS_PRIVATE(point_format); /*!< The format of point export in TLS messages uint8_t MBEDTLS_PRIVATE(point_format); /*!< The format of point export in TLS messages

1
include/mbedtls/ecdsa.h
View file

@ -29,6 +29,7 @@
#ifndef MBEDTLS_ECDSA_H #ifndef MBEDTLS_ECDSA_H
#define MBEDTLS_ECDSA_H #define MBEDTLS_ECDSA_H
#include "mbedtls/private_access.h"
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "mbedtls/config.h"

2
include/mbedtls/entropy.h
View file

@ -124,7 +124,7 @@ typedef struct mbedtls_entropy_context
#if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR) #if defined(MBEDTLS_ENTROPY_SHA512_ACCUMULATOR)
mbedtls_sha512_context MBEDTLS_PRIVATE(accumulator); mbedtls_sha512_context MBEDTLS_PRIVATE(accumulator);
#else #else
mbedtls_sha256_context accumulator; mbedtls_sha256_context MBEDTLS_PRIVATE(accumulator);
#endif #endif
int MBEDTLS_PRIVATE(source_count); /* Number of entries used in source. */ int MBEDTLS_PRIVATE(source_count); /* Number of entries used in source. */
mbedtls_entropy_source_state MBEDTLS_PRIVATE(source)[MBEDTLS_ENTROPY_MAX_SOURCES]; mbedtls_entropy_source_state MBEDTLS_PRIVATE(source)[MBEDTLS_ENTROPY_MAX_SOURCES];

6
include/mbedtls/ssl.h
View file

@ -940,9 +940,9 @@ struct mbedtls_ssl_session
#else /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */ #else /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
/*! The digest of the peer's end-CRT. This must be kept to detect CRT /*! The digest of the peer's end-CRT. This must be kept to detect CRT
* changes during renegotiation, mitigating the triple handshake attack. */ * changes during renegotiation, mitigating the triple handshake attack. */
unsigned char *peer_cert_digest; unsigned char *MBEDTLS_PRIVATE(peer_cert_digest);
size_t peer_cert_digest_len; size_t MBEDTLS_PRIVATE(peer_cert_digest_len);
mbedtls_md_type_t peer_cert_digest_type; mbedtls_md_type_t MBEDTLS_PRIVATE(peer_cert_digest_type);
#endif /* !MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */ #endif /* !MBEDTLS_SSL_KEEP_PEER_CERTIFICATE */
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRT_PARSE_C */
uint32_t MBEDTLS_PRIVATE(verify_result); /*!< verification result */ uint32_t MBEDTLS_PRIVATE(verify_result); /*!< verification result */

2
include/mbedtls/ssl_cookie.h
View file

@ -59,7 +59,7 @@ typedef struct mbedtls_ssl_cookie_ctx
{ {
mbedtls_md_context_t MBEDTLS_PRIVATE(hmac_ctx); /*!< context for the HMAC portion */ mbedtls_md_context_t MBEDTLS_PRIVATE(hmac_ctx); /*!< context for the HMAC portion */
#if !defined(MBEDTLS_HAVE_TIME) #if !defined(MBEDTLS_HAVE_TIME)
unsigned long serial; /*!< serial number for expiration */ unsigned long MBEDTLS_PRIVATE(serial); /*!< serial number for expiration */
#endif #endif
unsigned long MBEDTLS_PRIVATE(timeout); /*!< timeout delay, in seconds if HAVE_TIME, unsigned long MBEDTLS_PRIVATE(timeout); /*!< timeout delay, in seconds if HAVE_TIME,
or in number of tickets issued */ or in number of tickets issued */

3
include/psa/crypto_platform.h
View file

@ -32,6 +32,7 @@
#ifndef PSA_CRYPTO_PLATFORM_H #ifndef PSA_CRYPTO_PLATFORM_H
#define PSA_CRYPTO_PLATFORM_H #define PSA_CRYPTO_PLATFORM_H
#include "mbedtls/private_access.h"
/* Include the Mbed TLS configuration file, the way Mbed TLS does it /* Include the Mbed TLS configuration file, the way Mbed TLS does it
* in each of its header files. */ * in each of its header files. */
@ -92,7 +93,7 @@ static inline int mbedtls_key_owner_id_equal( mbedtls_key_owner_id_t id1,
* are expected to replace it with a custom definition. * are expected to replace it with a custom definition.
*/ */
typedef struct { typedef struct {
uintptr_t opaque[2]; uintptr_t MBEDTLS_PRIVATE(opaque)[2];
} mbedtls_psa_external_random_context_t; } mbedtls_psa_external_random_context_t;
#endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */ #endif /* MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG */

21
setup_and_run_MBEDTLS_PRIVATE.sh
View file

@ -8,3 +8,24 @@ doxygen mbedtls.doxyfile
cd .. cd ..
python3 apply_MBEDTLS_PRIVATE.py python3 apply_MBEDTLS_PRIVATE.py
git checkout include/mbedtls/config.h doxygen/mbedtls.doxyfile git checkout include/mbedtls/config.h doxygen/mbedtls.doxyfile
make clean
sed -i 's/GENERATE_XML = NO/GENERATE_XML = YES/g' doxygen/mbedtls.doxyfile
scripts/config.py set MBEDTLS_ECP_RESTARTABLE
scripts/config.py unset MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
scripts/config.py unset MBEDTLS_HAVE_TIME
cd doxygen
doxygen mbedtls.doxyfile
cd ..
python3 apply_MBEDTLS_PRIVATE.py
git checkout include/mbedtls/config.h doxygen/mbedtls.doxyfile
make clean
sed -i 's/GENERATE_XML = NO/GENERATE_XML = YES/g' doxygen/mbedtls.doxyfile
scripts/config.py realfull
cd doxygen
doxygen mbedtls.doxyfile
cd ..
python3 apply_MBEDTLS_PRIVATE.py
git checkout include/mbedtls/config.h doxygen/mbedtls.doxyfile