updated net_sockets.h and certs.h includes

Samsung · Apr 29, 2024 · d89d014 · d89d014
1 parent d087c4f
commit d89d014
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 38 deletions.
diff --git a/apps/examples/connect_test/connect_test_client_dtls.c b/apps/examples/connect_test/connect_test_client_dtls.c
@@ -23,13 +23,13 @@
 #include "connect_test_log.h"
 #include "connect_test_data.h"
 #include "mbedtls/config.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/timing.h"
 
 #define TAG "[CT_DTLS_CLIENT]"

diff --git a/apps/examples/connect_test/connect_test_client_tls.c b/apps/examples/connect_test/connect_test_client_tls.c
@@ -29,7 +29,7 @@
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 
 #define TAG "[CT_TLS_CLIENT]"
 #define DEBUG_LEVEL 0

diff --git a/apps/examples/connect_test/connect_test_server_dtls.c b/apps/examples/connect_test/connect_test_server_dtls.c
@@ -26,11 +26,11 @@
 #include "mbedtls/config.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/ssl_cookie.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/timing.h"

diff --git a/apps/examples/connect_test/connect_test_server_tls.c b/apps/examples/connect_test/connect_test_server_tls.c
@@ -28,7 +28,7 @@
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/debug.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/net_sockets.h"
 #include "mbedtls/error.h"

diff --git a/apps/examples/lwm2m_test/lwm2m_client_main.h b/apps/examples/lwm2m_test/lwm2m_client_main.h
@@ -81,7 +81,7 @@
 #include "connection.h"
 
 #ifdef WITH_MBEDTLS
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/easy_tls.h"
 #define LWM2M_CIPHERSUIT "TLS-PSK-WITH-AES-128-CBC-SHA"
 #endif

diff --git a/apps/examples/lwm2m_test/lwm2m_server_main.h b/apps/examples/lwm2m_test/lwm2m_server_main.h
@@ -80,7 +80,7 @@
 #include <tinyara/ascii.h>
 
 #ifdef WITH_MBEDTLS
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/easy_tls.h"
 #endif
 

diff --git a/apps/examples/performance/tls_handshake/tls_handshake_client.c b/apps/examples/performance/tls_handshake/tls_handshake_client.c
@@ -25,7 +25,7 @@
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 
 #include <string.h>
 

diff --git a/apps/examples/performance/tls_handshake/tls_handshake_server.c b/apps/examples/performance/tls_handshake/tls_handshake_server.c
@@ -80,7 +80,7 @@ int main(void)
 
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/net_sockets.h"

diff --git a/apps/examples/performance/tls_seclink/tls_common.h b/apps/examples/performance/tls_seclink/tls_common.h
@@ -49,13 +49,13 @@
 #define TLS_SERVER_PRI 105
 #define TLS_STACKSIZE 10240
 
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/timing.h"
 
 #define SERVER_PORT "4433"

diff --git a/apps/examples/testcase/le_tc/tcp_tls/tcp_tls_stress.c b/apps/examples/testcase/le_tc/tcp_tls/tcp_tls_stress.c
@@ -29,11 +29,11 @@
 #include <stress_tool/st_perf.h>
 
 #include "mbedtls/config.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"

diff --git a/apps/examples/webserver/webserver_main.c b/apps/examples/webserver/webserver_main.c
@@ -66,7 +66,7 @@
 #include <netutils/netlib.h>
 #include <protocols/webserver/http_server.h>
 #include <protocols/webserver/http_keyvalue_list.h>
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 
 #define MAX_DATA_SIZE 50
 #define MAX_BUF_SIZE 100

diff --git a/apps/examples/webserver_test/webserver_test_tls.h b/apps/examples/webserver_test/webserver_test_tls.h
@@ -20,10 +20,10 @@
 #include "mbedtls/config.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl_cache.h"

diff --git a/apps/examples/websocket/websocket_main.c b/apps/examples/websocket/websocket_main.c
@@ -122,10 +122,10 @@
 #include "mbedtls/config.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl_cache.h"

diff --git a/external/aws/platform/TizenRT/mbedtls/network_platform.h b/external/aws/platform/TizenRT/mbedtls/network_platform.h
@@ -18,11 +18,11 @@
 #include "mbedtls/config.h"
 
 #include "mbedtls/platform.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"

diff --git a/external/curl/vtls/mbedtls.c b/external/curl/vtls/mbedtls.c
@@ -32,13 +32,9 @@
 #ifdef CONFIG_MBEDTLS
 
 #include <mbedtls/version.h>
-#if MBEDTLS_VERSION_NUMBER >= 0x02040000
 #include <mbedtls/net_sockets.h>
-#else
-#include <mbedtls/net.h>
-#endif
 #include <mbedtls/ssl.h>
-#include <mbedtls/certs.h>
+#include <mbedtls/test/certs.h>
 #include <mbedtls/x509.h>
 
 #include <mbedtls/x509_crt.h>

diff --git a/external/grpc/src/core/tsi/ssl_transport_security.cc b/external/grpc/src/core/tsi/ssl_transport_security.cc
@@ -45,7 +45,7 @@ extern "C" {
 #include <mbedtls/pem.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/ctr_drbg.h>
-#include <mbedtls/certs.h>
+#include <mbedtls/test/certs.h>
 #include <mbedtls/x509.h>
 #include <mbedtls/error.h>
 #include <mbedtls/debug.h>

diff --git a/external/include/protocols/libcoap/net.h b/external/include/protocols/libcoap/net.h
@@ -64,7 +64,7 @@ extern "C" {
 #include <protocols/libcoap/coap_time.h>
 
 #ifdef WITH_MBEDTLS
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/easy_tls.h"
 #define COAP_CIPHERSUIT "TLS-PSK-WITH-AES-128-CBC-SHA"
 #endif

diff --git a/external/iotivity/iotivity_1.2-rel/resource/csdk/connectivity/test/ssladapter_test.cpp b/external/iotivity/iotivity_1.2-rel/resource/csdk/connectivity/test/ssladapter_test.cpp
@@ -1171,13 +1171,13 @@ static int client( void )
 }
 #else
 
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/debug.h"
 #include "mbedtls/ssl.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 
 #include <string.h>
 
@@ -1478,10 +1478,10 @@ static void * client(void *)
 
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 #include "mbedtls/x509.h"
 #include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/error.h"
 #include "mbedtls/debug.h"
 

diff --git a/external/mosquitto/config.h b/external/mosquitto/config.h
@@ -89,7 +89,7 @@
 
 #ifdef WITH_MBEDTLS
 #include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/pk.h"
 #include "mbedtls/ctr_drbg.h"

diff --git a/external/openssl/platform/ssl_pm.c b/external/openssl/platform/ssl_pm.c
@@ -35,12 +35,12 @@
 
 /* mbedtls include */
 #include "mbedtls/platform.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 //#include "mbedtls/debug.h"
 #include "mbedtls/entropy.h"
 #include "mbedtls/ctr_drbg.h"
 #include "mbedtls/error.h"
-#include "mbedtls/certs.h"
+#include "mbedtls/test/certs.h"
 
 #define X509_INFO_STRING_LENGTH 3072
 #define OPENSSL_READ_BUFFER_LENGTH_MIN 2048

diff --git a/framework/src/network/mqtt/config.h b/framework/src/network/mqtt/config.h
@@ -50,7 +50,7 @@
 
 #ifdef WITH_MBEDTLS
 #include "mbedtls/ssl.h"
-#include "mbedtls/net.h"
+#include "mbedtls/net_sockets.h"
 #include "mbedtls/x509_crt.h"
 #include "mbedtls/pk.h"
 #include "mbedtls/ctr_drbg.h"

diff --git a/os/board/rtl8720e/src/component/wifi/wpa_supplicant/src/crypto/tls_polarssl.c b/os/board/rtl8720e/src/component/wifi/wpa_supplicant/src/crypto/tls_polarssl.c
@@ -81,7 +81,7 @@ void my_debug(void *ctx, int level, const char *str)
 }
 
 #include <mbedtls/ssl.h>
-#include <mbedtls/net.h>
+#include <mbedtls/net_sockets.h>
 #include <mbedtls/ssl_internal.h>
 #include <mbedtls/debug.h>
 

diff --git a/...ard/rtl8721csm/src/component/common/api/wifi/rtw_wpa_supplicant/src/crypto/tls_polarssl.c b/...ard/rtl8721csm/src/component/common/api/wifi/rtw_wpa_supplicant/src/crypto/tls_polarssl.c
@@ -551,7 +551,7 @@ struct wpabuf * tls_connection_decrypt(void *tls_ctx,
 #elif CONFIG_USE_MBEDTLS /* CONFIG_USE_POLARSSL */
 
 #include <mbedtls/ssl.h>
-#include <mbedtls/net.h>
+#include <mbedtls/net_sockets.h>
 #include <mbedtls/ssl_internal.h>
 #include <mbedtls/debug.h>