michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mbedtls: add CONFIG_MBEDTLS_INIT

Browse source 
Add a config flag to enable conditional mbebtls
initialization at startup, defaulting to enabled.

Also add a function, mbedtls_init(), that should be
called by platforms that wish to initialise mbedtls
at a time of their choosing.

Signed-off-by: Eugene Cohen <quic_egmc@quicinc.com>
Signed-off-by: Dave Aldridge <quic_daldridg@quicinc.com>
This commit is contained in:
Eugene Cohen 2021-04-20 12:31:44 -07:00 • committed by Carles Cufí
commit 3e294acf31
3 changed files with 35 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
modules/mbedtls/Kconfig
View file

@ -182,8 +182,8 @@ config MBEDTLS_ENABLE_HEAP
This option enables the mbedtls to use the heap. This setting must This option enables the mbedtls to use the heap. This setting must
be global so that various applications and libraries in Zephyr do not be global so that various applications and libraries in Zephyr do not
try to do this themselves as there can be only one heap defined try to do this themselves as there can be only one heap defined
in mbedtls. If this is enabled, then the Zephyr will, during the device in mbedtls. If this is enabled, and MBEDTLS_INIT is enabled then the
startup, initialize the heap automatically. Zephyr will, during the device startup, initialize the heap automatically.
config MBEDTLS_HEAP_SIZE config MBEDTLS_HEAP_SIZE
int "Heap size for mbed TLS" int "Heap size for mbed TLS"
@ -201,6 +201,13 @@ config MBEDTLS_HEAP_SIZE
be needed. For some dedicated and specific usage of mbedtls API, the be needed. For some dedicated and specific usage of mbedtls API, the
1000 bytes might be ok. 1000 bytes might be ok.
config MBEDTLS_INIT
bool "Initialize mbed TLS at boot"
default y
help
By default mbed TLS will be initialized at Zephyr init. Disabling this option
will defer the initialization until explicitly called.
config MBEDTLS_SHELL config MBEDTLS_SHELL
bool "mbed TLS shell" bool "mbed TLS shell"
depends on MBEDTLS depends on MBEDTLS

15
modules/mbedtls/include/mbedtls_init.h Normal file
View file

@ -0,0 +1,15 @@
/*
* Copyright (c) 2022 Qualcomm Innovation Center, Inc.
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifndef MBEDTLS_INIT_H
#define MBEDTLS_INIT_H
/* This should be called by platforms that do not wish to
* have mbedtls initialised during kernel startup
*/
int mbedtls_init(void);
#endif /* MBEDTLS_INIT_H */

11
modules/mbedtls/zephyr_init.c
View file

@ -95,4 +95,15 @@ static int _mbedtls_init(void)
return 0; return 0;
} }
#if defined(CONFIG_MBEDTLS_INIT)
SYS_INIT(_mbedtls_init, POST_KERNEL, 0); SYS_INIT(_mbedtls_init, POST_KERNEL, 0);
#endif
/* if CONFIG_MBEDTLS_INIT is not defined then this function
* should be called by the platform before any mbedtls functionality
* is used
*/
int mbedtls_init(void)
{
return _mbedtls_init(NULL);
}