Skip to content

Commit b81aeff

Browse files
evedonevedon
authored
Merge pull request #11110 from ARMmbed/release-candidate
Release candidate for mbed-os-5.13.2
2 parents 5941d17 + 337c5b4 commit b81aeff

File tree

85 files changed

+4003
-2046
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+4003
-2046
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
*.cpp text
33
*.h text
44
*.s text
5+
*.S text
56
*.sct text
67
*.ld text
78
*.txt text

‎TESTS/mbed-crypto/sanity/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include "psa/crypto.h"
19+
1820
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
1921
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
2022
#endif
@@ -24,7 +26,6 @@
2426
#include "greentea-client/test_env.h"
2527
#include "unity.h"
2628
#include "utest.h"
27-
#include "psa/crypto.h"
2829
#include "entropy.h"
2930
#include "entropy_poll.h"
3031

‎TESTS/mbed_drivers/watchdog/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ using utest::v1::Harness;
6868

6969
using namespace mbed;
7070

71-
Thread wdg_kicking_thread;
71+
Thread wdg_kicking_thread(osPriorityNormal, 768);
7272
Semaphore kick_wdg_during_test_teardown(0, 1);
7373

7474
void wdg_kicking_thread_fun()

‎TESTS/mbed_hal/watchdog/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ using utest::v1::Harness;
6969

7070
const watchdog_config_t WDG_CONFIG_DEFAULT = { .timeout_ms = WDG_TIMEOUT_MS };
7171

72-
Thread wdg_kicking_thread;
72+
Thread wdg_kicking_thread(osPriorityNormal, 768);
7373
Semaphore kick_wdg_during_test_teardown(0, 1);
7474

7575
void wdg_kicking_thread_fun()

‎TESTS/mbed_hal_fpga_ci_test_shield/analogin/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ using namespace utest::v1;
3636

3737
#define analogin_debug_printf(...)
3838

39-
#define DELTA_FLOAT 0.03f // 3%
40-
#define DELTA_U16 1965 // 3%
39+
#define DELTA_FLOAT 0.05f // 5%
40+
#define DELTA_U16 3277 // 5%
4141

4242
const PinList *form_factor = pinmap_ff_default_pins();
4343
const PinList *restricted = pinmap_restricted_pins();

‎TESTS/mbed_hal_fpga_ci_test_shield/i2c/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,7 @@ void i2c_test_byte_read(PinName sda, PinName scl)
366366
// Reset tester stats and select I2C
367367
tester.peripherals_reset();
368368
tester.select_peripheral(MbedTester::PeripheralI2C);
369+
tester.set_next_from_slave(0);
369370
for (int i = 0; i < TRANSFER_COUNT; i++) {
370371
data_in[i] = 0;
371372
}
@@ -413,7 +414,7 @@ void i2c_test_byte_read(PinName sda, PinName scl)
413414
TEST_ASSERT_EQUAL(num_nacks, tester.num_nacks());
414415
TEST_ASSERT_EQUAL(checksum, tester.get_send_checksum());
415416
TEST_ASSERT_EQUAL(0, tester.state_num());
416-
TEST_ASSERT_EQUAL(((TRANSFER_COUNT + 2) & 0xFF), tester.get_next_from_slave());
417+
TEST_ASSERT_EQUAL(((TRANSFER_COUNT) & 0xFF), tester.get_next_from_slave());
417418
TEST_ASSERT_EQUAL(num_writes, tester.num_writes());
418419
TEST_ASSERT_EQUAL(num_reads, tester.num_reads());
419420

‎TESTS/mbed_hal_fpga_ci_test_shield/pwm/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ void pwm_period_fill_test(PinName pin, uint32_t period_ms, uint32_t fill_prc, pw
122122
break;
123123
}
124124

125+
wait(PERIOD_FLOAT(period_ms));
126+
125127
tester.io_metrics_start();
126128

127129
wait(NUM_OF_PERIODS * PERIOD_FLOAT(period_ms));

‎TESTS/mbed_hal_fpga_ci_test_shield/spi/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void spi_async_handler()
5555
{
5656
int event = spi_irq_handler_asynch(&spi);
5757

58-
if (event == SPI_EVENT_COMPLETE) {
58+
if (event & SPI_EVENT_COMPLETE) {
5959
async_trasfer_done = true;
6060
}
6161
}
@@ -136,7 +136,7 @@ void spi_test_common(PinName mosi, PinName miso, PinName sclk, PinName ssel, SPI
136136

137137
async_trasfer_done = false;
138138

139-
spi_master_transfer(&spi, tx_buf, TRANSFER_COUNT, rx_buf, TRANSFER_COUNT, 8, (uint32_t)spi_async_handler, 0, DMA_USAGE_NEVER);
139+
spi_master_transfer(&spi, tx_buf, TRANSFER_COUNT, rx_buf, TRANSFER_COUNT, 8, (uint32_t)spi_async_handler, SPI_EVENT_COMPLETE, DMA_USAGE_NEVER);
140140
while (!async_trasfer_done);
141141

142142
for (int i = 0; i < TRANSFER_COUNT; i++) {

‎TESTS/mbed_hal_fpga_ci_test_shield/uart/main.cpp

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,13 @@ static void uart_test_common(int baudrate, int data_bits, SerialParity parity, i
118118
serial_init(&serial, tx, rx);
119119
serial_baud(&serial, baudrate);
120120
serial_format(&serial, data_bits, parity, stop_bits);
121+
#if DEVICE_SERIAL_FC
121122
if (use_flow_control) {
122123
serial_set_flow_control(&serial, FlowControlRTSCTS, rts, cts);
123124
} else {
124125
serial_set_flow_control(&serial, FlowControlNone, NC, NC);
125126
}
127+
#endif
126128

127129
// Reset tester stats and select UART
128130
tester.peripherals_reset();
@@ -277,9 +279,11 @@ void test_init_free(PinName tx, PinName rx, PinName cts = NC, PinName rts = NC)
277279
serial_init(&serial, tx, rx);
278280
serial_baud(&serial, 9600);
279281
serial_format(&serial, 8, ParityNone, 1);
282+
#if DEVICE_SERIAL_FC
280283
if (use_flow_control) {
281284
serial_set_flow_control(&serial, FlowControlRTSCTS, rts, cts);
282285
}
286+
#endif
283287
serial_free(&serial);
284288
}
285289

@@ -302,28 +306,38 @@ void test_common_no_fc(PinName tx, PinName rx)
302306

303307
Case cases[] = {
304308
// Every set of pins from every peripheral.
305-
Case("init/free, FC on", all_ports<UARTPort, DefaultFormFactor, test_init_free>),
306309
Case("init/free, FC off", all_ports<UARTNoFCPort, DefaultFormFactor, test_init_free_no_fc>),
307310

308311
// One set of pins from every peripheral.
309-
Case("basic, 9600, 8N1, FC on", all_peripherals<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 1> >),
310312
Case("basic, 9600, 8N1, FC off", all_peripherals<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 1> >),
311313

312314
// One set of pins from one peripheral.
313315
// baudrate
314-
Case("19200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<19200, 8, ParityNone, 1> >),
315316
Case("19200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<19200, 8, ParityNone, 1> >),
316-
Case("38400, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<38400, 8, ParityNone, 1> >),
317317
Case("38400, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<38400, 8, ParityNone, 1> >),
318-
Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<115200, 8, ParityNone, 1> >),
319318
Case("115200, 8N1, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<115200, 8, ParityNone, 1> >),
319+
// stop bits
320+
Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 2> >),
321+
322+
#if DEVICE_SERIAL_FC
323+
// Every set of pins from every peripheral.
324+
Case("init/free, FC on", all_ports<UARTPort, DefaultFormFactor, test_init_free>),
325+
326+
// One set of pins from every peripheral.
327+
Case("basic, 9600, 8N1, FC on", all_peripherals<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 1> >),
328+
329+
// One set of pins from one peripheral.
330+
// baudrate
331+
Case("19200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<19200, 8, ParityNone, 1> >),
332+
Case("38400, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<38400, 8, ParityNone, 1> >),
333+
Case("115200, 8N1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<115200, 8, ParityNone, 1> >),
320334
// data bits: not tested (some platforms support 8 bits only)
321335
// parity
322336
Case("9600, 8O1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityOdd, 1> >),
323337
Case("9600, 8E1, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityEven, 1> >),
324338
// stop bits
325339
Case("9600, 8N2, FC on", one_peripheral<UARTPort, DefaultFormFactor, test_common<9600, 8, ParityNone, 2> >),
326-
Case("9600, 8N2, FC off", one_peripheral<UARTNoFCPort, DefaultFormFactor, test_common_no_fc<9600, 8, ParityNone, 2> >),
340+
#endif
327341
};
328342

329343
utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

‎TESTS/psa/attestation/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
* limitations under the License.
1717
*/
1818

19+
#include "psa/crypto.h"
20+
1921
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2022
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
2123
#endif // TARGET_PSA

‎TESTS/psa/crypto_access_control/COMPONENT_NSPE/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
* limitations under the License.
1616
*/
1717

18+
#include "psa/crypto.h"
19+
1820
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)) || (!defined(COMPONENT_PSA_SRV_IPC)))
1921
#error [NOT_SUPPORTED] These tests can run only on SPM-enabled targets and where Mbed Crypto is ON - skipping.
2022
#endif
@@ -24,7 +26,6 @@
2426
#include "greentea-client/test_env.h"
2527
#include "unity.h"
2628
#include "utest.h"
27-
#include "psa/crypto.h"
2829
#include "entropy.h"
2930
#include "entropy_poll.h"
3031
#include "test_partition_proxy.h"

‎TESTS/psa/crypto_init/main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
* limitations under the License.
1717
*/
1818

19+
#include "psa/crypto.h"
20+
1921
#if ((!defined(TARGET_PSA)) || (!defined(MBEDTLS_PSA_CRYPTO_C)))
2022
#error [NOT_SUPPORTED] Mbed Crypto is OFF - skipping.
2123
#endif // TARGET_PSA
2224

2325
#include "greentea-client/test_env.h"
2426
#include "unity/unity.h"
2527
#include "utest/utest.h"
26-
#include "crypto.h"
2728
#include "entropy.h"
2829
#include "entropy_poll.h"
2930

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,8 +536,6 @@ static bool _firmware_header_valid(BlockDevice &flash, bool &valid)
536536
static bool _firmware_get_active_bank(BlockDevice &flash, bool &second_bank_active)
537537
{
538538
uint8_t buf[sizeof(SYNC_WORD)];
539-
size_t pos = 0;
540-
size_t read_size;
541539

542540
if (flash.read(buf, FLASH_SECTOR_SIZE - sizeof(SYNC_WORD), sizeof(SYNC_WORD)) != BD_ERROR_OK) {
543541
return false;
@@ -708,7 +706,7 @@ bool MbedTester::firmware_dump(mbed::FileHandle *dest, mbed::Callback<void(uint8
708706
return false;
709707
}
710708
ssize_t write_size = dest->write(buf, read_size);
711-
if (write_size != read_size) {
709+
if ((uint32_t)write_size != read_size) {
712710
sys_pin_mode_disabled();
713711
return false;
714712
}
@@ -761,7 +759,7 @@ bool MbedTester::firmware_dump_all(mbed::FileHandle *dest, mbed::Callback<void(u
761759
return false;
762760
}
763761
ssize_t write_size = dest->write(buf, read_size);
764-
if (write_size != read_size) {
762+
if ((uint32_t)write_size != read_size) {
765763
sys_pin_mode_disabled();
766764
return false;
767765
}
@@ -1154,7 +1152,7 @@ uint8_t MbedTester::io_expander_read_index(int index, IOExpanderReg reg_type)
11541152
}
11551153

11561154
int read_success = io_expander_i2c_read(i2c_index, dev_addr, reg, read_byte, 1);
1157-
// MBED_ASSERT(read_success == 0);
1155+
MBED_ASSERT(read_success == 0);
11581156
uint8_t bit = (read_byte[0] & (1 << reg_bit)) >> reg_bit;
11591157
return bit;
11601158
}
@@ -1489,7 +1487,7 @@ uint8_t MbedTester::io_expander_read_bb(PinName pin, IOExpanderReg reg_type)
14891487
}
14901488

14911489
int read_success = io_expander_i2c_read_bb(sda, scl, dev_addr, reg, read_byte, 1);
1492-
// MBED_ASSERT(read_success == 0);
1490+
MBED_ASSERT(read_success == 0);
14931491
uint8_t bit = (read_byte[0] & (1 << reg_bit)) >> reg_bit;
14941492
return bit;
14951493
}

‎components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,11 @@ void find_ports(std::list<PortType> &matched_ports, std::list<PortType> &not_mat
115115
FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
116116
continue;
117117
}
118+
if (pinmap_list_has_peripheral(pinmap_restricted_peripherals(), port.peripheral)) {
119+
utest_printf("Skipping %s peripheral %i with pin %s (%i)\r\n", pin_type,
120+
port.peripheral, FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
121+
continue;
122+
}
118123
// skipp pin searching if single pin port type
119124
if (PortType::pin_count > 1) {
120125
find_port_pins<PortType, FormFactorType>(port);
@@ -511,6 +516,7 @@ typedef Port<1, AnalogoutMaps, DefaultFormFactor, TF1> AnalogoutPort;
511516
#endif
512517

513518
#if DEVICE_SERIAL
519+
#if DEVICE_SERIAL_FC
514520
struct UARTMaps {
515521
static const PinMap *maps[];
516522
static const char *const pin_type_names[];
@@ -520,6 +526,7 @@ const PinMap *UARTMaps::maps[] = { serial_tx_pinmap(), serial_rx_pinmap(), seria
520526
const char *const UARTMaps::pin_type_names[] = { "TX", "RX", "CLS", "RTS" };
521527
const char *const UARTMaps::name = "UART";
522528
typedef Port<4, UARTMaps, DefaultFormFactor, TF4> UARTPort;
529+
#endif
523530

524531
struct UARTNoFCMaps {
525532
static const PinMap *maps[];

‎features/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/sources/ble/bb/bb_ble_reslist.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
#include "bb_ble_api.h"
2626
#include "bb_ble_api_reslist.h"
2727
#include "bb_ble_api_pdufilt.h"
28-
#include "pal_bb_ble.h"
29-
#include "pal_crypto.h"
28+
#include "stack/platform/include/pal_bb_ble.h"
29+
#include "stack/platform/include/pal_crypto.h"
3030
#include "wsf_assert.h"
3131
#include "ll_math.h"
3232
#include "util/bda.h"

‎features/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/sources/ble/lctr/lctr_act_enc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "wsf_msg.h"
2828
#include "wsf_trace.h"
2929
#include "util/bstream.h"
30-
#include "pal_crypto.h"
30+
#include "stack/platform/include/pal_crypto.h"
3131
#include <string.h>
3232

3333
/*************************************************************************************************/

‎features/FEATURE_BLE/targets/TARGET_CORDIO_LL/stack/controller/sources/ble/ll/ll_main_enc_slave.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "ll_math.h"
2727
#include "wsf_msg.h"
2828
#include "wsf_trace.h"
29-
#include "pal_crypto.h"
29+
#include "stack/platform/include/pal_crypto.h"
3030
#include <string.h>
3131

3232
/*************************************************************************************************/

‎features/FEATURE_BLE/targets/TARGET_NORDIC/TARGET_NORDIC_CORDIO/TARGET_NRF5x/stack/sources/pal_bb_ble_rf.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*/
2222
/*************************************************************************************************/
2323

24-
#include "pal_types.h"
24+
#include "stack/platform/include/pal_types.h"
2525

2626
/**************************************************************************************************
2727
Macros

‎features/cellular/framework/AT/AT_CellularContext.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -757,10 +757,7 @@ void AT_CellularContext::check_and_deactivate_context()
757757
}
758758

759759
if (_new_context_set) {
760-
_at.clear_error();
761-
_at.cmd_start("AT+CGDCONT=");
762-
_at.write_int(_cid);
763-
_at.cmd_stop_read_resp();
760+
delete_current_context();
764761
}
765762

766763
_at.restore_at_timeout();

‎features/mbedtls/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mbedtls-2.18.0-rc3
1+
mbedtls-2.18.1

‎features/mbedtls/importer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#
2828

2929
# Set the mbed TLS release to import (this can/should be edited before import)
30-
MBED_TLS_RELEASE ?= mbedtls-2.18.0-rc3
30+
MBED_TLS_RELEASE ?= mbedtls-2.18.1
3131
MBED_TLS_REPO_URL ?= [email protected]:ARMmbed/mbedtls-restricted.git
3232

3333
# Translate between mbed TLS namespace and mbed namespace

‎features/mbedtls/inc/mbedtls/platform.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@ int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
256256
* the destination buffer is too short.
257257
*/
258258
#if defined(MBEDTLS_PLATFORM_HAS_NON_CONFORMING_VSNPRINTF)
259+
#include <stdarg.h>
259260
/* For Older Windows (inc. MSYS2), we provide our own fixed implementation */
260261
int mbedtls_platform_win32_vsnprintf( char *s, size_t n, const char *fmt, va_list arg );
261262
#endif

‎features/mbedtls/inc/mbedtls/version.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,17 +39,17 @@
3939
* Major, Minor, Patchlevel
4040
*/
4141
#define MBEDTLS_VERSION_MAJOR 2
42-
#define MBEDTLS_VERSION_MINOR 17
42+
#define MBEDTLS_VERSION_MINOR 18
4343
#define MBEDTLS_VERSION_PATCH 0
4444

4545
/**
4646
* The single version number has the following structure:
4747
* MMNNPP00
4848
* Major version | Minor version | Patch version
4949
*/
50-
#define MBEDTLS_VERSION_NUMBER 0x02110000
51-
#define MBEDTLS_VERSION_STRING "2.17.0"
52-
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.17.0"
50+
#define MBEDTLS_VERSION_NUMBER 0x02120000
51+
#define MBEDTLS_VERSION_STRING "2.18.0"
52+
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 2.18.0"
5353

5454
#if defined(MBEDTLS_VERSION_C)
5555

‎features/mbedtls/mbed-crypto/VERSION.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
mbedcrypto-1.1.0d2
1+
mbedcrypto-1.1.1

‎features/mbedtls/mbed-crypto/importer/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
# Set the Mbed Crypto release to import (this can/should be edited before
3131
# import)
32-
CRYPTO_RELEASE ?= mbedcrypto-1.1.0d2
32+
CRYPTO_RELEASE ?= mbedcrypto-1.1.1
3333
CRYPTO_REPO_URL ?= [email protected]:ARMmbed/mbed-crypto.git
3434

3535
# Translate between Mbed Crypto namespace and Mbed OS namespace

‎features/mbedtls/mbed-crypto/src/ecp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2004,8 +2004,10 @@ static unsigned char ecp_pick_window_size( const mbedtls_ecp_group *grp,
20042004
* Make sure w is within bounds.
20052005
* (The last test is useful only for very small curves in the test suite.)
20062006
*/
2007+
#if( MBEDTLS_ECP_WINDOW_SIZE < 6 )
20072008
if( w > MBEDTLS_ECP_WINDOW_SIZE )
20082009
w = MBEDTLS_ECP_WINDOW_SIZE;
2010+
#endif
20092011
if( w >= grp->nbits )
20102012
w = 2;
20112013

0 commit comments

Comments
 (0)