Skip to content

Commit 53e6745

Browse files
Ron EldorRon Eldor
Ron Eldor
authored and
Ron Eldor
committed
Include platform.h
Include `platform.h` even if `MBEDTLS_PLATFORM_C` is undefined, to include the feature unsupported error.
1 parent e245477 commit 53e6745

File tree

19 files changed

+20
-37
lines changed

19 files changed

+20
-37
lines changed

‎include/mbedtls/platform.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,14 @@
5050
extern "C" {
5151
#endif
5252

53+
#if defined(MBEDTLS_PLATFORM_C)
5354
/**
5455
* \name SECTION: Module settings
5556
*
5657
* The configuration options you can set for this module are in this section.
5758
* Either change them in config.h or define them on the compiler command line.
5859
* \{
5960
*/
60-
6161
/* The older Microsoft Windows common runtime provides non-conforming
6262
* implementations of some standard library functions, including snprintf
6363
* and vsnprintf. This affects MSVC and MinGW builds.
@@ -411,6 +411,7 @@ int mbedtls_platform_setup( mbedtls_platform_context *ctx );
411411
*/
412412
void mbedtls_platform_teardown( mbedtls_platform_context *ctx );
413413

414+
#endif /* MBEDTLS_PLATFORM_C */
414415
#ifdef __cplusplus
415416
}
416417
#endif

‎library/aria.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
#include <string.h>
3939

4040
#if defined(MBEDTLS_SELF_TEST)
41-
#if defined(MBEDTLS_PLATFORM_C)
4241
#include "mbedtls/platform.h"
43-
#else
42+
#if !defined(MBEDTLS_PLATFORM_C)
4443
#include <stdio.h>
4544
#define mbedtls_printf printf
4645
#endif /* MBEDTLS_PLATFORM_C */

‎library/camellia.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@
3939
#include <string.h>
4040

4141
#if defined(MBEDTLS_SELF_TEST)
42-
#if defined(MBEDTLS_PLATFORM_C)
4342
#include "mbedtls/platform.h"
44-
#else
43+
#if !defined(MBEDTLS_PLATFORM_C)
4544
#include <stdio.h>
4645
#define mbedtls_printf printf
4746
#endif /* MBEDTLS_PLATFORM_C */

‎library/ccm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@
4242
#include <string.h>
4343

4444
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
45-
#if defined(MBEDTLS_PLATFORM_C)
4645
#include "mbedtls/platform.h"
47-
#else
46+
#if !defined(MBEDTLS_PLATFORM_C)
4847
#include <stdio.h>
4948
#define mbedtls_printf printf
5049
#endif /* MBEDTLS_PLATFORM_C */

‎library/chacha20.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
#include <string.h>
3939

4040
#if defined(MBEDTLS_SELF_TEST)
41-
#if defined(MBEDTLS_PLATFORM_C)
4241
#include "mbedtls/platform.h"
43-
#else
42+
#if !defined(MBEDTLS_PLATFORM_C)
4443
#include <stdio.h>
4544
#define mbedtls_printf printf
4645
#endif /* MBEDTLS_PLATFORM_C */

‎library/chachapoly.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
#include <string.h>
3535

3636
#if defined(MBEDTLS_SELF_TEST)
37-
#if defined(MBEDTLS_PLATFORM_C)
3837
#include "mbedtls/platform.h"
39-
#else
38+
#if !defined(MBEDTLS_PLATFORM_C)
4039
#include <stdio.h>
4140
#define mbedtls_printf printf
4241
#endif /* MBEDTLS_PLATFORM_C */

‎library/cmac.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,8 @@
5454
#include <string.h>
5555

5656

57-
#if defined(MBEDTLS_PLATFORM_C)
5857
#include "mbedtls/platform.h"
59-
#else
58+
#if !defined(MBEDTLS_PLATFORM_C)
6059
#include <stdlib.h>
6160
#define mbedtls_calloc calloc
6261
#define mbedtls_free free

‎library/dhm.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
#include "mbedtls/asn1.h"
4949
#endif
5050

51-
#if defined(MBEDTLS_PLATFORM_C)
5251
#include "mbedtls/platform.h"
53-
#else
52+
#if !defined(MBEDTLS_PLATFORM_C)
5453
#include <stdlib.h>
5554
#include <stdio.h>
5655
#define mbedtls_printf printf

‎library/ecp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,8 @@
9292
#define ECP_VALIDATE( cond ) \
9393
MBEDTLS_INTERNAL_VALIDATE( cond )
9494

95-
#if defined(MBEDTLS_PLATFORM_C)
9695
#include "mbedtls/platform.h"
97-
#else
96+
#if !defined(MBEDTLS_PLATFORM_C)
9897
#include <stdlib.h>
9998
#include <stdio.h>
10099
#define mbedtls_printf printf

‎library/hmac_drbg.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,8 @@
4343
#endif
4444

4545
#if defined(MBEDTLS_SELF_TEST)
46-
#if defined(MBEDTLS_PLATFORM_C)
4746
#include "mbedtls/platform.h"
48-
#else
47+
#if !defined(MBEDTLS_PLATFORM_C)
4948
#include <stdio.h>
5049
#define mbedtls_printf printf
5150
#endif /* MBEDTLS_SELF_TEST */

‎library/nist_kw.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
#include <string.h>
4545

4646
#if defined(MBEDTLS_SELF_TEST) && defined(MBEDTLS_AES_C)
47-
#if defined(MBEDTLS_PLATFORM_C)
4847
#include "mbedtls/platform.h"
49-
#else
48+
#if !defined(MBEDTLS_PLATFORM_C)
5049
#include <stdio.h>
5150
#define mbedtls_printf printf
5251
#endif /* MBEDTLS_PLATFORM_C */

‎library/pkcs5.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@
4747

4848
#include <string.h>
4949

50-
#if defined(MBEDTLS_PLATFORM_C)
5150
#include "mbedtls/platform.h"
52-
#else
51+
#if !defined(MBEDTLS_PLATFORM_C)
5352
#include <stdio.h>
5453
#define mbedtls_printf printf
5554
#endif

‎library/poly1305.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,8 @@
3434
#include <string.h>
3535

3636
#if defined(MBEDTLS_SELF_TEST)
37-
#if defined(MBEDTLS_PLATFORM_C)
3837
#include "mbedtls/platform.h"
39-
#else
38+
#if !defined(MBEDTLS_PLATFORM_C)
4039
#include <stdio.h>
4140
#define mbedtls_printf printf
4241
#endif /* MBEDTLS_PLATFORM_C */

‎library/rsa.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,8 @@
6060
#include <stdlib.h>
6161
#endif
6262

63-
#if defined(MBEDTLS_PLATFORM_C)
6463
#include "mbedtls/platform.h"
65-
#else
64+
#if !defined(MBEDTLS_PLATFORM_C)
6665
#include <stdio.h>
6766
#define mbedtls_printf printf
6867
#define mbedtls_calloc calloc

‎library/sha1.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
#include <string.h>
3939

4040
#if defined(MBEDTLS_SELF_TEST)
41-
#if defined(MBEDTLS_PLATFORM_C)
4241
#include "mbedtls/platform.h"
43-
#else
42+
#if !defined(MBEDTLS_PLATFORM_C)
4443
#include <stdio.h>
4544
#define mbedtls_printf printf
4645
#endif /* MBEDTLS_PLATFORM_C */

‎library/sha256.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@
3838
#include <string.h>
3939

4040
#if defined(MBEDTLS_SELF_TEST)
41-
#if defined(MBEDTLS_PLATFORM_C)
4241
#include "mbedtls/platform.h"
43-
#else
42+
#if !defined(MBEDTLS_PLATFORM_C)
4443
#include <stdio.h>
4544
#include <stdlib.h>
4645
#define mbedtls_printf printf

‎library/sha512.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
#include <string.h>
4545

4646
#if defined(MBEDTLS_SELF_TEST)
47-
#if defined(MBEDTLS_PLATFORM_C)
4847
#include "mbedtls/platform.h"
49-
#else
48+
#if !defined(MBEDTLS_PLATFORM_C)
5049
#include <stdio.h>
5150
#include <stdlib.h>
5251
#define mbedtls_printf printf

‎library/xtea.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@
3333
#include <string.h>
3434

3535
#if defined(MBEDTLS_SELF_TEST)
36-
#if defined(MBEDTLS_PLATFORM_C)
3736
#include "mbedtls/platform.h"
38-
#else
37+
#if !defined(MBEDTLS_PLATFORM_C)
3938
#include <stdio.h>
4039
#define mbedtls_printf printf
4140
#endif /* MBEDTLS_PLATFORM_C */

‎programs/test/benchmark.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@
2525
#include MBEDTLS_CONFIG_FILE
2626
#endif
2727

28-
#if defined(MBEDTLS_PLATFORM_C)
2928
#include "mbedtls/platform.h"
30-
#else
29+
#if !defined(MBEDTLS_PLATFORM_C)
3130
#include <stdio.h>
3231
#include <stdlib.h>
3332
#define mbedtls_exit exit

0 commit comments

Comments
 (0)