diff options
| author | danh-arm <dan.handley@arm.com> | 2016-01-06 14:50:15 +0000 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2016-01-06 14:50:15 +0000 |
| commit | d37b2098f718a3df52da69bba6f22308d303c112 (patch) | |
| tree | ba88358b3b7ae31b1fb4d82e384d714e04f87478 /drivers | |
| parent | 4a900a2aa0556046aac94e9dd09af306fe9265f6 (diff) | |
| parent | aa856917abecafc371dd7e02405957e9d63007b9 (diff) | |
Merge pull request #478 from sandrine-bailleux/sb/mbed-tls-pedantic
Always build with '-pedantic'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_common.mk | 1 | ||||
| -rw-r--r-- | drivers/auth/mbedtls/mbedtls_crypto.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/auth/mbedtls/mbedtls_common.mk b/drivers/auth/mbedtls/mbedtls_common.mk index bc381d5e..5186f16f 100644 --- a/drivers/auth/mbedtls/mbedtls_common.mk +++ b/drivers/auth/mbedtls/mbedtls_common.mk @@ -55,6 +55,5 @@ MBEDTLS_COMMON_SOURCES := drivers/auth/mbedtls/mbedtls_common.c \ BL1_SOURCES += ${MBEDTLS_COMMON_SOURCES} BL2_SOURCES += ${MBEDTLS_COMMON_SOURCES} -DISABLE_PEDANTIC := 1 endif diff --git a/drivers/auth/mbedtls/mbedtls_crypto.c b/drivers/auth/mbedtls/mbedtls_crypto.c index 6a898ddc..1a96e8f8 100644 --- a/drivers/auth/mbedtls/mbedtls_crypto.c +++ b/drivers/auth/mbedtls/mbedtls_crypto.c @@ -174,7 +174,7 @@ static int verify_hash(void *data_ptr, unsigned int data_len, /* Digest info should be an MBEDTLS_ASN1_SEQUENCE */ 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 | MBEDTLS_ASN1_SEQUENCE); if (rc != 0) { |