Skip to content

Commit 9cd3813

Browse files
0xc01700xc0170
authored
Merge pull request #12045 from tymoteuszblochmobica/wisun
Netsocket test adjusted to Wisun
2 parents b1b0673 + 0859ff7 commit 9cd3813

File tree

6 files changed

+273
-2
lines changed

6 files changed

+273
-2
lines changed

‎TESTS/configs/mbedtls_wisun_config.h

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
/*
2+
* Copyright (c) 2019, Arm Limited and affiliates.
3+
* SPDX-License-Identifier: Apache-2.0
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#ifndef MBEDTLS_WISUN_CONFIG_H_
19+
#define MBEDTLS_WISUN_CONFIG_H_
20+
21+
#define MBEDTLS_ENTROPY_MAX_SOURCES 20 // save 320 bytes of RAM (default is 20 entropy source)
22+
#define MBEDTLS_SSL_MAX_CONTENT_LEN 4096 // Use 4kB buffers for input and output instead of 16kB
23+
24+
#define MBEDTLS_DEBUG_C
25+
26+
/* mbed TLS feature support */
27+
28+
#define MBEDTLS_ECP_NIST_OPTIM
29+
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
30+
31+
#undef MBEDTLS_ECP_DP_SECP192R1_ENABLED
32+
#undef MBEDTLS_ECP_DP_SECP224R1_ENABLED
33+
#undef MBEDTLS_ECP_DP_SECP384R1_ENABLED
34+
#undef MBEDTLS_ECP_DP_SECP521R1_ENABLED
35+
#undef MBEDTLS_ECP_DP_SECP192K1_ENABLED
36+
#undef MBEDTLS_ECP_DP_SECP224K1_ENABLED
37+
#undef MBEDTLS_ECP_DP_SECP256K1_ENABLED
38+
#undef MBEDTLS_ECP_DP_BP256R1_ENABLED
39+
#undef MBEDTLS_ECP_DP_BP384R1_ENABLED
40+
#undef MBEDTLS_ECP_DP_BP512R1_ENABLED
41+
#undef MBEDTLS_ECP_DP_CURVE25519_ENABLED
42+
43+
#ifdef MBEDTLS_SSL_TLS_C
44+
#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
45+
#define MBEDTLS_SSL_PROTO_TLS1_2
46+
#define MBEDTLS_SSL_EXPORT_KEYS
47+
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
48+
#endif
49+
50+
/* mbed TLS modules */
51+
#define MBEDTLS_BIGNUM_C
52+
#define MBEDTLS_CIPHER_C
53+
#define MBEDTLS_AES_C
54+
#define MBEDTLS_CCM_C
55+
#define MBEDTLS_CTR_DRBG_C
56+
#define MBEDTLS_ECP_C
57+
#define MBEDTLS_MD_C
58+
#define MBEDTLS_PK_C
59+
#define MBEDTLS_SHA256_C
60+
61+
#ifdef MBEDTLS_SSL_TLS_C
62+
#define MBEDTLS_SSL_COOKIE_C
63+
#define MBEDTLS_SSL_CLI_C
64+
#define MBEDTLS_SSL_SRV_C
65+
#endif
66+
67+
#define MBEDTLS_NIST_KW_C
68+
#define MBEDTLS_PEM_PARSE_C
69+
#define MBEDTLS_BASE64_C
70+
#define MBEDTLS_SHA1_C
71+
72+
/* Save RAM at the expense of ROM */
73+
#define MBEDTLS_AES_ROM_TABLES
74+
#define MBEDTLS_AES_FEWER_TABLES
75+
76+
/* Save RAM by adjusting to our exact needs */
77+
#define MBEDTLS_ECP_MAX_BITS 256
78+
#undef MBEDTLS_MPI_MAX_SIZE
79+
#define MBEDTLS_MPI_MAX_SIZE 256 // 256 bits is 32 bytes
80+
81+
#define MBEDTLS_X509_USE_C
82+
#define MBEDTLS_X509_CRT_PARSE_C
83+
84+
/* Optimization. Remove all not needed stuff */
85+
#undef MBEDTLS_SSL_SERVER_NAME_INDICATION
86+
#undef MBEDTLS_SELF_TEST
87+
#undef MBEDTLS_SSL_ENCRYPT_THEN_MAC
88+
#undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET
89+
90+
#define MBEDTLS_ASN1_PARSE_C
91+
#define MBEDTLS_ASN1_WRITE_C
92+
#define MBEDTLS_ECDH_C
93+
#define MBEDTLS_ECDSA_C
94+
95+
#undef MBEDTLS_ERROR_C
96+
97+
#define MBEDTLS_GCM_C
98+
#define MBEDTLS_OID_C
99+
#define MBEDTLS_PK_PARSE_C
100+
#define MBEDTLS_PK_WRITE_C
101+
102+
#undef MBEDTLS_VERSION_C
103+
#undef MBEDTLS_CERTS_C
104+
#undef MBEDTLS_HMAC_DRBG_C
105+
106+
#define MBEDTLS_CIPHER_MODE_CBC
107+
108+
#undef MBEDTLS_CIPHER_PADDING_PKCS7
109+
#undef MBEDTLS_ECDSA_DETERMINISTIC
110+
#undef MBEDTLS_SSL_SESSION_TICKETS
111+
#undef MBEDTLS_VERSION_FEATURES
112+
#undef MBEDTLS_X509_CHECK_KEY_USAGE
113+
#undef MBEDTLS_X509_CHECK_EXTENDED_KEY_USAGE
114+
#undef MBEDTLS_ERROR_STRERROR_DUMMY
115+
#undef MBEDTLS_SSL_ALPN
116+
#undef MBEDTLS_SSL_TICKET_C
117+
#undef MBEDTLS_HAVE_SSE2
118+
#undef MBEDTLS_PLATFORM_MEMORY
119+
#undef MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
120+
#undef MBEDTLS_DEPRECATED_WARNING
121+
#undef MBEDTLS_DEPRECATED_REMOVED
122+
#undef MBEDTLS_CAMELLIA_SMALL_MEMORY
123+
#undef MBEDTLS_CIPHER_MODE_CFB
124+
#undef MBEDTLS_CIPHER_MODE_CTR
125+
#undef MBEDTLS_CIPHER_NULL_CIPHER
126+
#undef MBEDTLS_CIPHER_PADDING_ONE_AND_ZEROS
127+
#undef MBEDTLS_CIPHER_PADDING_ZEROS_AND_LEN
128+
#undef MBEDTLS_CIPHER_PADDING_ZEROS
129+
#undef MBEDTLS_ENABLE_WEAK_CIPHERSUITES
130+
131+
#define MBEDTLS_REMOVE_ARC4_CIPHERSUITES
132+
#undef MBEDTLS_ECP_DP_CURVE25519_ENABLED
133+
#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
134+
#undef MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED
135+
#define MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED
136+
#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
137+
138+
#undef MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED
139+
#undef MBEDTLS_KEY_EXCHANGE_ECDH_RSA_ENABLED
140+
#undef MBEDTLS_PK_PARSE_EC_EXTENDED
141+
#undef MBEDTLS_GENPRIME
142+
#undef MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
143+
#undef MBEDTLS_MEMORY_DEBUG
144+
#undef MBEDTLS_MEMORY_BACKTRACE
145+
#undef MBEDTLS_PK_RSA_ALT_SUPPORT
146+
147+
#undef MBEDTLS_RSA_NO_CRT
148+
#undef MBEDTLS_SSL_AEAD_RANDOM_IV
149+
#undef MBEDTLS_RSA_NO_CRT
150+
#undef MBEDTLS_SSL_DEBUG_ALL
151+
#undef MBEDTLS_SSL_FALLBACK_SCSV
152+
#undef MBEDTLS_SSL_HW_RECORD_ACCEL
153+
#undef MBEDTLS_SSL_CBC_RECORD_SPLITTING
154+
#undef MBEDTLS_SSL_RENEGOTIATION
155+
#undef MBEDTLS_SSL_SRV_SUPPORT_SSLV2_CLIENT_HELLO
156+
#undef MBEDTLS_SSL_SRV_RESPECT_CLIENT_PREFERENCE
157+
#undef MBEDTLS_SSL_PROTO_TLS1
158+
#undef MBEDTLS_SSL_PROTO_TLS1_1
159+
#undef MBEDTLS_SSL_DTLS_BADMAC_LIMIT
160+
#undef MBEDTLS_SSL_TRUNCATED_HMAC
161+
#undef MBEDTLS_THREADING_ALT
162+
#undef MBEDTLS_THREADING_PTHREAD
163+
#undef MBEDTLS_X509_ALLOW_EXTENSIONS_NON_V3
164+
#undef MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION
165+
#undef MBEDTLS_X509_RSASSA_PSS_SUPPORT
166+
#undef MBEDTLS_ZLIB_SUPPORT
167+
#undef MBEDTLS_AESNI_C
168+
#undef MBEDTLS_ARC4_C
169+
#undef MBEDTLS_BLOWFISH_C
170+
#undef MBEDTLS_CAMELLIA_C
171+
#undef MBEDTLS_DES_C
172+
#undef MBEDTLS_DHM_C
173+
#undef MBEDTLS_HAVEGE_C
174+
#undef MBEDTLS_MD2_C
175+
#undef MBEDTLS_MD4_C
176+
#undef MBEDTLS_MD5_C
177+
#undef MBEDTLS_MEMORY_BUFFER_ALLOC_C
178+
#undef MBEDTLS_PADLOCK_C
179+
#undef MBEDTLS_PEM_WRITE_C
180+
#undef MBEDTLS_PKCS5_C
181+
#undef MBEDTLS_PKCS11_C
182+
#undef MBEDTLS_PKCS12_C
183+
#undef MBEDTLS_PLATFORM_C
184+
#undef MBEDTLS_RIPEMD160_C
185+
#undef MBEDTLS_SHA512_C
186+
#undef MBEDTLS_SSL_CACHE_C
187+
#undef MBEDTLS_THREADING_C*/
188+
#define MBEDTLS_X509_CREATE_C
189+
#define MBEDTLS_X509_CRT_WRITE_C
190+
#undef MBEDTLS_XTEA_C
191+
192+
#include "mbedtls/check_config.h"
193+
194+
#endif /* MBEDTLS_WISUN_CONFIG_H */

‎TESTS/configs/wisun_S2LP.json

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"config": {
3+
"echo-server-addr" : {
4+
"help" : "IP address of echo server",
5+
"value" : "\"echo.mbedcloudtesting.com\""
6+
},
7+
"echo-server-port" : {
8+
"help" : "Port of echo server",
9+
"value" : "7"
10+
},
11+
"echo-server-discard-port" : {
12+
"help" : "Discard port of echo server",
13+
"value" : "9"
14+
},
15+
"echo-server-port-tls" : {
16+
"help" : "Port of echo server for TLS",
17+
"value" : "2007"
18+
},
19+
"echo-server-discard-port-tls" : {
20+
"help" : "Discard port of echo server for TLS",
21+
"value" : "2009"
22+
}
23+
},
24+
"macros":["MBEDTLS_USER_CONFIG_FILE=\"TESTS\\configs\\mbedtls_wisun_config.h\""],
25+
"target_overrides": {
26+
"*": {
27+
"target.network-default-interface-type": "MESH",
28+
"nsapi.default-mesh-type": "WISUN",
29+
"mbed-mesh-api.wisun-network-name": "\"Wi-SUN Network\"",
30+
"nanostack.configuration": "ws_router",
31+
"mbed-mesh-api.certificate-header": "\"wisun_certificates.h\"",
32+
"mbed-mesh-api.root-certificate": "WISUN_ROOT_CERTIFICATE",
33+
"mbed-mesh-api.own-certificate": "WISUN_CLIENT_CERTIFICATE",
34+
"mbed-mesh-api.own-certificate-key": "WISUN_CLIENT_KEY",
35+
"mbed-trace.enable": false,
36+
"platform.stdio-baud-rate": 115200,
37+
"s2lp.provide-default": true,
38+
"target.device_has_add": ["802_15_4_PHY"]
39+
},
40+
"K64F": {
41+
42+
},
43+
"K66F": {
44+
45+
},
46+
"NUCLEO_F429ZI": {
47+
48+
}
49+
}
50+
}
51+

‎TESTS/netsocket/dns/dns_tests.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,13 @@ namespace dns_global {
7474
#ifdef MBED_GREENTEA_TEST_DNSSOCKET_TIMEOUT_S
7575
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_DNSSOCKET_TIMEOUT_S;
7676
#else
77-
static const int TESTS_TIMEOUT = 14 * 60;
77+
#define MESH 3
78+
#define WISUN 0x2345
79+
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH && MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN
80+
static const int TESTS_TIMEOUT = (25 * 60);
81+
#else
82+
static const int TESTS_TIMEOUT = (10 * 60);
83+
#endif
7884
#endif
7985
}
8086

‎TESTS/netsocket/tcp/tcp_tests.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,15 @@ namespace tcp_global {
5050
#ifdef MBED_GREENTEA_TEST_TCPSOCKET_TIMEOUT_S
5151
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_TCPSOCKET_TIMEOUT_S;
5252
#else
53+
#define MESH 3
54+
#define WISUN 0x2345
55+
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH && MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN
56+
static const int TESTS_TIMEOUT = (25 * 60);
57+
#else
5358
static const int TESTS_TIMEOUT = (10 * 60);
5459
#endif
60+
#endif
61+
5562
static const int TCP_OS_STACK_SIZE = 2048;
5663

5764
static const int RX_BUFF_SIZE = 1220;

‎TESTS/netsocket/tls/tls_tests.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,15 @@ namespace tls_global {
5252
#ifdef MBED_GREENTEA_TEST_TLSSOCKET_TIMEOUT_S
5353
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_TLSSOCKET_TIMEOUT_S;
5454
#else
55+
#define MESH 3
56+
#define WISUN 0x2345
57+
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH && MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN
58+
static const int TESTS_TIMEOUT = (25 * 60);
59+
#else
5560
static const int TESTS_TIMEOUT = (10 * 60);
5661
#endif
62+
#endif
63+
5764
static const int TLS_OS_STACK_SIZE = 2048;
5865

5966
static const int RX_BUFF_SIZE = 1220;

‎TESTS/netsocket/udp/udp_tests.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,13 @@ namespace udp_global {
4343
#ifdef MBED_GREENTEA_TEST_UDPSOCKET_TIMEOUT_S
4444
static const int TESTS_TIMEOUT = MBED_GREENTEA_TEST_UDPSOCKET_TIMEOUT_S;
4545
#else
46-
static const int TESTS_TIMEOUT = 480;
46+
#define MESH 3
47+
#define WISUN 0x2345
48+
#if MBED_CONF_TARGET_NETWORK_DEFAULT_INTERFACE_TYPE == MESH && MBED_CONF_NSAPI_DEFAULT_MESH_TYPE == WISUN
49+
static const int TESTS_TIMEOUT = (25 * 60);
50+
#else
51+
static const int TESTS_TIMEOUT = (10 * 60);
52+
#endif
4753
#endif
4854

4955
static const int MAX_SEND_SIZE_IPV4 = 536;

0 commit comments

Comments
 (0)