Commit aa856917 authored by Sandrine Bailleux's avatar Sandrine Bailleux
Browse files

Always build with '-pedantic'

By default ARM TF is built with the '-pedantic' compiler flag, which
helps detecting violations of the C standard. However, the mbed TLS
library and its associated authentication module in TF used to fail
building with this compiler flag. As a workaround, the mbed TLS
authentication module makefile used to set the 'DISABLE_PEDANTIC'
TF build flag.

The compiler errors flagged by '-pedantic' in the mbed TLS library
have been fixed between versions 1.3.9 and 2.2.0 and the library now
properly builds with this compiler flag.

This patch fixes the remaining compiler errors in the mbed TLS
authentication module in TF and unsets the 'DISABLE_PEDANTIC' TF
build flag. This means that TF is now always built with '-pedantic'.

In particular, this patch:

 * Removes the final semi-colon in REGISTER_COT() macro.

   This semi-colon was causing the following error message:

   drivers/auth/tbbr/tbbr_cot.c:544:23: error: ISO C does not allow
   extra ';' outside of a function [-Werror=pedantic]

   This has been fixed both in the mbed TLS authentication module
   as well as in the certificate generation tool. Note that the latter
   code didn't need fixing since it is not built with '-pedantic' but
   the change has been propagated for consistency.

   Also fixed the REGISTER_KEYS() and REGISTER_EXTENSIONS() macros,
   which were suffering from the same issue.

 * Fixes a pointer type.

   It was causing the following error message:

   drivers/auth/mbedtls/mbedtls_crypto.c: In function 'verify_hash':
   drivers/auth/mbedtls/mbedtls_crypto.c:177:42: error: pointer of
   type 'void *' used in arithmetic [-Werror=pointer-arith]

Change-Id: I7b7a04ef711efd65e17b5be26990d1a0d940257d
parent d0c104e1
...@@ -55,6 +55,5 @@ MBEDTLS_COMMON_SOURCES := drivers/auth/mbedtls/mbedtls_common.c \ ...@@ -55,6 +55,5 @@ MBEDTLS_COMMON_SOURCES := drivers/auth/mbedtls/mbedtls_common.c \
BL1_SOURCES += ${MBEDTLS_COMMON_SOURCES} BL1_SOURCES += ${MBEDTLS_COMMON_SOURCES}
BL2_SOURCES += ${MBEDTLS_COMMON_SOURCES} BL2_SOURCES += ${MBEDTLS_COMMON_SOURCES}
DISABLE_PEDANTIC := 1
endif endif
...@@ -174,7 +174,7 @@ static int verify_hash(void *data_ptr, unsigned int data_len, ...@@ -174,7 +174,7 @@ static int verify_hash(void *data_ptr, unsigned int data_len,
/* Digest info should be an MBEDTLS_ASN1_SEQUENCE */ /* Digest info should be an MBEDTLS_ASN1_SEQUENCE */
p = (unsigned char *)digest_info_ptr; p = (unsigned char *)digest_info_ptr;
end = (unsigned char *)(digest_info_ptr + digest_info_len); end = p + digest_info_len;
rc = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED | rc = mbedtls_asn1_get_tag(&p, end, &len, MBEDTLS_ASN1_CONSTRUCTED |
MBEDTLS_ASN1_SEQUENCE); MBEDTLS_ASN1_SEQUENCE);
if (rc != 0) { if (rc != 0) {
......
...@@ -65,7 +65,7 @@ int auth_mod_verify_img(unsigned int img_id, ...@@ -65,7 +65,7 @@ int auth_mod_verify_img(unsigned int img_id,
#define REGISTER_COT(_cot) \ #define REGISTER_COT(_cot) \
const auth_img_desc_t *const cot_desc_ptr = \ const auth_img_desc_t *const cot_desc_ptr = \
(const auth_img_desc_t *const)&_cot[0]; \ (const auth_img_desc_t *const)&_cot[0]; \
unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])]; unsigned int auth_img_flags[sizeof(_cot)/sizeof(_cot[0])]
#endif /* TRUSTED_BOARD_BOOT */ #endif /* TRUSTED_BOARD_BOOT */
......
...@@ -76,7 +76,7 @@ int cert_new(cert_t *cert, int days, int ca, STACK_OF(X509_EXTENSION) * sk); ...@@ -76,7 +76,7 @@ int cert_new(cert_t *cert, int days, int ca, STACK_OF(X509_EXTENSION) * sk);
/* Macro to register the certificates used in the CoT */ /* Macro to register the certificates used in the CoT */
#define REGISTER_COT(_certs) \ #define REGISTER_COT(_certs) \
cert_t *certs = &_certs[0]; \ cert_t *certs = &_certs[0]; \
const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0]); const unsigned int num_certs = sizeof(_certs)/sizeof(_certs[0])
/* Exported variables */ /* Exported variables */
extern cert_t *certs; extern cert_t *certs;
......
...@@ -92,7 +92,7 @@ X509_EXTENSION *ext_new_key(int nid, int crit, EVP_PKEY *k); ...@@ -92,7 +92,7 @@ X509_EXTENSION *ext_new_key(int nid, int crit, EVP_PKEY *k);
/* Macro to register the extensions used in the CoT */ /* Macro to register the extensions used in the CoT */
#define REGISTER_EXTENSIONS(_ext) \ #define REGISTER_EXTENSIONS(_ext) \
ext_t *extensions = &_ext[0]; \ ext_t *extensions = &_ext[0]; \
const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0]); const unsigned int num_extensions = sizeof(_ext)/sizeof(_ext[0])
/* Exported variables */ /* Exported variables */
extern ext_t *extensions; extern ext_t *extensions;
......
...@@ -79,7 +79,7 @@ int key_store(key_t *key); ...@@ -79,7 +79,7 @@ int key_store(key_t *key);
/* Macro to register the keys used in the CoT */ /* Macro to register the keys used in the CoT */
#define REGISTER_KEYS(_keys) \ #define REGISTER_KEYS(_keys) \
key_t *keys = &_keys[0]; \ key_t *keys = &_keys[0]; \
const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0]); const unsigned int num_keys = sizeof(_keys)/sizeof(_keys[0])
/* Exported variables */ /* Exported variables */
extern key_t *keys; extern key_t *keys;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment