Rename mbedtls_platform_memcmp() to mbedtls_platform_memequal()
Signed-off-by: Piotr Nowicki <piotr.nowicki@arm.com>
diff --git a/library/asn1parse.c b/library/asn1parse.c
index 8cdc1f1..1563716 100644
--- a/library/asn1parse.c
+++ b/library/asn1parse.c
@@ -431,7 +431,7 @@
while( list != NULL )
{
if( list->oid.len == len &&
- mbedtls_platform_memcmp( list->oid.p, oid, len ) == 0 )
+ mbedtls_platform_memequal( list->oid.p, oid, len ) == 0 )
{
break;
}
diff --git a/library/asn1write.c b/library/asn1write.c
index e393ef8..fe10e21 100644
--- a/library/asn1write.c
+++ b/library/asn1write.c
@@ -348,7 +348,7 @@
while( list != NULL )
{
if( list->oid.len == len &&
- mbedtls_platform_memcmp( list->oid.p, oid, len ) == 0 )
+ mbedtls_platform_memequal( list->oid.p, oid, len ) == 0 )
{
break;
}
diff --git a/library/des.c b/library/des.c
index c920328..8f01ec1 100644
--- a/library/des.c
+++ b/library/des.c
@@ -417,7 +417,7 @@
int i;
for( i = 0; i < WEAK_KEY_COUNT; i++ )
- if( mbedtls_platform_memcmp( weak_key_table[i], key, MBEDTLS_DES_KEY_SIZE) == 0 )
+ if( mbedtls_platform_memequal( weak_key_table[i], key, MBEDTLS_DES_KEY_SIZE) == 0 )
return( 1 );
return( 0 );
diff --git a/library/oid.c b/library/oid.c
index 00a02c3..98235a1 100644
--- a/library/oid.c
+++ b/library/oid.c
@@ -75,7 +75,7 @@
if( p == NULL || oid == NULL ) return( NULL ); \
while( cur->asn1 != NULL ) { \
if( cur->asn1_len == oid->len && \
- mbedtls_platform_memcmp( cur->asn1, oid->p, oid->len ) == 0 ) { \
+ mbedtls_platform_memequal( cur->asn1, oid->p, oid->len ) == 0 ) { \
return( p ); \
} \
p++; \
diff --git a/library/pem.c b/library/pem.c
index 5e2fca9..41a4931 100644
--- a/library/pem.c
+++ b/library/pem.c
@@ -273,7 +273,7 @@
enc = 0;
- if( s2 - s1 >= 22 && mbedtls_platform_memcmp( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
+ if( s2 - s1 >= 22 && mbedtls_platform_memequal( s1, "Proc-Type: 4,ENCRYPTED", 22 ) == 0 )
{
#if defined(MBEDTLS_MD5_C) && defined(MBEDTLS_CIPHER_MODE_CBC) && \
( defined(MBEDTLS_DES_C) || defined(MBEDTLS_AES_C) )
@@ -286,7 +286,7 @@
#if defined(MBEDTLS_DES_C)
- if( s2 - s1 >= 23 && mbedtls_platform_memcmp( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 )
+ if( s2 - s1 >= 23 && mbedtls_platform_memequal( s1, "DEK-Info: DES-EDE3-CBC,", 23 ) == 0 )
{
enc_alg = MBEDTLS_CIPHER_DES_EDE3_CBC;
@@ -296,7 +296,7 @@
s1 += 16;
}
- else if( s2 - s1 >= 18 && mbedtls_platform_memcmp( s1, "DEK-Info: DES-CBC,", 18 ) == 0 )
+ else if( s2 - s1 >= 18 && mbedtls_platform_memequal( s1, "DEK-Info: DES-CBC,", 18 ) == 0 )
{
enc_alg = MBEDTLS_CIPHER_DES_CBC;
@@ -309,15 +309,15 @@
#endif /* MBEDTLS_DES_C */
#if defined(MBEDTLS_AES_C)
- if( s2 - s1 >= 14 && mbedtls_platform_memcmp( s1, "DEK-Info: AES-", 14 ) == 0 )
+ if( s2 - s1 >= 14 && mbedtls_platform_memequal( s1, "DEK-Info: AES-", 14 ) == 0 )
{
if( s2 - s1 < 22 )
return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
- else if( mbedtls_platform_memcmp( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 )
+ else if( mbedtls_platform_memequal( s1, "DEK-Info: AES-128-CBC,", 22 ) == 0 )
enc_alg = MBEDTLS_CIPHER_AES_128_CBC;
- else if( mbedtls_platform_memcmp( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 )
+ else if( mbedtls_platform_memequal( s1, "DEK-Info: AES-192-CBC,", 22 ) == 0 )
enc_alg = MBEDTLS_CIPHER_AES_192_CBC;
- else if( mbedtls_platform_memcmp( s1, "DEK-Info: AES-256-CBC,", 22 ) == 0 )
+ else if( mbedtls_platform_memequal( s1, "DEK-Info: AES-256-CBC,", 22 ) == 0 )
enc_alg = MBEDTLS_CIPHER_AES_256_CBC;
else
return( MBEDTLS_ERR_PEM_UNKNOWN_ENC_ALG );
diff --git a/library/pk.c b/library/pk.c
index fea7576..4976f1f 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -556,7 +556,7 @@
const mbedtls_uecc_keypair *uecc_prv =
(const mbedtls_uecc_keypair *) prv;
- if( mbedtls_platform_memcmp( uecc_pub->public_key,
+ if( mbedtls_platform_memequal( uecc_pub->public_key,
uecc_prv->public_key,
2 * NUM_ECC_BYTES ) == 0 )
{
diff --git a/library/pkparse.c b/library/pkparse.c
index 411fbaa..f10a61e 100644
--- a/library/pkparse.c
+++ b/library/pkparse.c
@@ -309,7 +309,7 @@
return( ret );
if( len != MBEDTLS_OID_SIZE( MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD ) ||
- mbedtls_platform_memcmp( p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len ) != 0 )
+ mbedtls_platform_memequal( p, MBEDTLS_OID_ANSI_X9_62_PRIME_FIELD, len ) != 0 )
{
return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
}
diff --git a/library/platform_util.c b/library/platform_util.c
index fc6eb5a..24c7b41 100644
--- a/library/platform_util.c
+++ b/library/platform_util.c
@@ -144,7 +144,7 @@
return MBEDTLS_ERR_PLATFORM_ALLOC_FAILED;
}
-int mbedtls_platform_memcmp( const void *buf1, const void *buf2, size_t num )
+int mbedtls_platform_memequal( const void *buf1, const void *buf2, size_t num )
{
volatile const unsigned char *A = (volatile const unsigned char *) buf1;
volatile const unsigned char *B = (volatile const unsigned char *) buf2;
diff --git a/library/rsa.c b/library/rsa.c
index 3f480a3..67ebf84 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -2275,7 +2275,7 @@
if ( ret != 0 )
goto exit;
- if( mbedtls_platform_memcmp( hash_start, result, hlen ) != 0 )
+ if( mbedtls_platform_memequal( hash_start, result, hlen ) != 0 )
{
ret = MBEDTLS_ERR_RSA_VERIFY_FAILED;
goto exit;
diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index a4d8cd3..278a477 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -94,7 +94,7 @@
continue;
}
- if( mbedtls_platform_memcmp( session->id, entry->session.id,
+ if( mbedtls_platform_memequal( session->id, entry->session.id,
entry->session.id_len ) != 0 )
continue;
@@ -180,7 +180,7 @@
}
#endif
- if( mbedtls_platform_memcmp( session->id, cur->session.id, cur->session.id_len ) == 0 )
+ if( mbedtls_platform_memequal( session->id, cur->session.id, cur->session.id_len ) == 0 )
break; /* client reconnected, keep timestamp for session id */
#if defined(MBEDTLS_HAVE_TIME)
diff --git a/library/ssl_cli.c b/library/ssl_cli.c
index 58cbd87..e2c24e2 100644
--- a/library/ssl_cli.c
+++ b/library/ssl_cli.c
@@ -1164,9 +1164,9 @@
/* Check verify-data in constant-time. The length OTOH is no secret */
if( len != 1 + ssl->verify_data_len * 2 ||
buf[0] != ssl->verify_data_len * 2 ||
- mbedtls_platform_memcmp( buf + 1,
+ mbedtls_platform_memequal( buf + 1,
ssl->own_verify_data, ssl->verify_data_len ) != 0 ||
- mbedtls_platform_memcmp( buf + 1 + ssl->verify_data_len,
+ mbedtls_platform_memequal( buf + 1 + ssl->verify_data_len,
ssl->peer_verify_data, ssl->verify_data_len ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "non-matching renegotiation info" ) );
@@ -1495,7 +1495,7 @@
for( p = ssl->conf->alpn_list; *p != NULL; p++ )
{
if( name_len == strlen( *p ) &&
- mbedtls_platform_memcmp( buf + 3, *p, name_len ) == 0 )
+ mbedtls_platform_memequal( buf + 3, *p, name_len ) == 0 )
{
ssl->alpn_chosen = *p;
return( 0 );
@@ -1746,7 +1746,7 @@
mbedtls_platform_memcpy( ssl->handshake->randbytes + 32, buf + 2, 32 );
- if( mbedtls_platform_memcmp( ssl->handshake->randbytes + 32, buf + 2, 32 ) == 0 )
+ if( mbedtls_platform_memequal( ssl->handshake->randbytes + 32, buf + 2, 32 ) == 0 )
{
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_SET;
}
@@ -1847,7 +1847,7 @@
mbedtls_ssl_session_get_ciphersuite( ssl->session_negotiate ) != i ||
mbedtls_ssl_session_get_compression( ssl->session_negotiate ) != comp ||
ssl->session_negotiate->id_len != n ||
- mbedtls_platform_memcmp( ssl->session_negotiate->id, buf + 35, n ) != 0 )
+ mbedtls_platform_memequal( ssl->session_negotiate->id, buf + 35, n ) != 0 )
{
ssl->handshake->resume = MBEDTLS_SSL_FI_FLAG_UNSET;
}
@@ -2876,7 +2876,7 @@
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
}
- if( mbedtls_platform_memcmp( p, ecdh_group, sizeof( ecdh_group ) ) != 0 )
+ if( mbedtls_platform_memequal( p, ecdh_group, sizeof( ecdh_group ) ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "Bad server key exchange (unexpected header)" ) );
return( MBEDTLS_ERR_SSL_HW_ACCEL_FAILED );
diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c
index 5b590db..f2d3ede 100644
--- a/library/ssl_cookie.c
+++ b/library/ssl_cookie.c
@@ -229,7 +229,7 @@
if( ret != 0 )
return( ret );
- if( mbedtls_platform_memcmp( cookie + 4, ref_hmac, sizeof( ref_hmac ) ) != 0 )
+ if( mbedtls_platform_memequal( cookie + 4, ref_hmac, sizeof( ref_hmac ) ) != 0 )
return( -1 );
#if defined(MBEDTLS_HAVE_TIME)
diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index abfef5d..ec0c21a 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -162,7 +162,7 @@
/* Check verify-data in constant-time. The length OTOH is no secret */
if( len != 1 + ssl->verify_data_len ||
buf[0] != ssl->verify_data_len ||
- mbedtls_platform_memcmp( buf + 1, ssl->peer_verify_data,
+ mbedtls_platform_memequal( buf + 1, ssl->peer_verify_data,
ssl->verify_data_len ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "non-matching renegotiation info" ) );
@@ -711,7 +711,7 @@
cur_len = *theirs++;
if( cur_len == ours_len &&
- mbedtls_platform_memcmp( theirs, *ours, cur_len ) == 0 )
+ mbedtls_platform_memequal( theirs, *ours, cur_len ) == 0 )
{
ssl->alpn_chosen = *ours;
return( 0 );
@@ -1228,7 +1228,7 @@
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_UNSET;
memset( ssl->handshake->randbytes, 0, 64 );
mbedtls_platform_memcpy( ssl->handshake->randbytes + 32 - chal_len, p, chal_len );
- if( mbedtls_platform_memcmp( ssl->handshake->randbytes + 32 - chal_len, p, chal_len ) == 0 )
+ if( mbedtls_platform_memequal( ssl->handshake->randbytes + 32 - chal_len, p, chal_len ) == 0 )
{
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_SET;
}
@@ -1628,7 +1628,7 @@
* fragment_offset == 0 and fragment_length == length
*/
if( ssl->in_msg[6] != 0 || ssl->in_msg[7] != 0 || ssl->in_msg[8] != 0 ||
- mbedtls_platform_memcmp( ssl->in_msg + 1, ssl->in_msg + 9, 3 ) != 0 )
+ mbedtls_platform_memequal( ssl->in_msg + 1, ssl->in_msg + 9, 3 ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "ClientHello fragmentation not supported" ) );
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
@@ -1728,7 +1728,7 @@
MBEDTLS_SSL_DEBUG_BUF( 3, "client hello, random bytes", buf + 2, 32 );
mbedtls_platform_memcpy( ssl->handshake->randbytes, buf + 2, 32 );
- if( mbedtls_platform_memcmp( ssl->handshake->randbytes, buf + 2, 32 ) == 0 )
+ if( mbedtls_platform_memequal( ssl->handshake->randbytes, buf + 2, 32 ) == 0 )
{
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_SET;
}
@@ -2827,7 +2827,7 @@
p += 28;
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_UNSET;
mbedtls_platform_memcpy( ssl->handshake->randbytes + 32, buf + 6, 32 );
- if( mbedtls_platform_memcmp( ssl->handshake->randbytes + 32, buf + 6, 32 ) == 0 )
+ if( mbedtls_platform_memequal( ssl->handshake->randbytes + 32, buf + 6, 32 ) == 0 )
{
ssl->handshake->hello_random_set = MBEDTLS_SSL_FI_FLAG_SET;
}
@@ -4119,7 +4119,7 @@
/* Identity is not a big secret since clients send it in the clear,
* but treat it carefully anyway, just in case */
if( n != ssl->conf->psk_identity_len ||
- mbedtls_platform_memcmp( ssl->conf->psk_identity, *p, n ) != 0 )
+ mbedtls_platform_memequal( ssl->conf->psk_identity, *p, n ) != 0 )
{
ret = MBEDTLS_ERR_SSL_UNKNOWN_IDENTITY;
}
diff --git a/library/ssl_ticket.c b/library/ssl_ticket.c
index 98147b7..96478f6 100644
--- a/library/ssl_ticket.c
+++ b/library/ssl_ticket.c
@@ -259,7 +259,7 @@
unsigned char i;
for( i = 0; i < sizeof( ctx->keys ) / sizeof( *ctx->keys ); i++ )
- if( mbedtls_platform_memcmp( name, ctx->keys[i].name, 4 ) == 0 )
+ if( mbedtls_platform_memequal( name, ctx->keys[i].name, 4 ) == 0 )
return( &ctx->keys[i] );
return( NULL );
diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 1ee7af0..55ac133 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -3164,7 +3164,7 @@
*
* Afterwards, we know that data + data_len is followed by at
* least maclen Bytes, which justifies the call to
- * mbedtls_platform_memcmp() below.
+ * mbedtls_platform_memequal() below.
*
* Further, we still know that data_len > minlen */
rec->data_len -= transform->maclen;
@@ -3186,8 +3186,8 @@
transform->maclen );
/* Compare expected MAC with MAC at the end of the record. */
- if( mbedtls_platform_memcmp( data + rec->data_len, mac_expect,
- transform->maclen ) != 0 )
+ if( mbedtls_platform_memequal( data + rec->data_len, mac_expect,
+ transform->maclen ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "message mac does not match" ) );
return( MBEDTLS_ERR_SSL_INVALID_MAC );
@@ -3525,8 +3525,8 @@
MBEDTLS_SSL_DEBUG_BUF( 4, "message mac", data + rec->data_len, transform->maclen );
#endif
- if( mbedtls_platform_memcmp( data + rec->data_len, mac_expect,
- transform->maclen ) != 0 )
+ if( mbedtls_platform_memequal( data + rec->data_len, mac_expect,
+ transform->maclen ) != 0 )
{
#if defined(MBEDTLS_SSL_DEBUG_ALL)
MBEDTLS_SSL_DEBUG_MSG( 1, ( "message mac does not match" ) );
@@ -4734,8 +4734,8 @@
static int ssl_hs_is_proper_fragment( mbedtls_ssl_context *ssl )
{
if( ssl->in_msglen < ssl->in_hslen ||
- mbedtls_platform_memcmp( ssl->in_msg + 6, "\0\0\0", 3 ) != 0 ||
- mbedtls_platform_memcmp( ssl->in_msg + 9, ssl->in_msg + 1, 3 ) != 0 )
+ mbedtls_platform_memequal( ssl->in_msg + 6, "\0\0\0", 3 ) != 0 ||
+ mbedtls_platform_memequal( ssl->in_msg + 9, ssl->in_msg + 1, 3 ) != 0 )
{
return( PROPER_HS_FRAGMENT );
}
@@ -7070,7 +7070,7 @@
if( peer_crt->raw.len != crt_buf_len )
return( PEER_CRT_CHANGED );
- return( mbedtls_platform_memcmp( peer_crt->raw.p, crt_buf, crt_buf_len ) );
+ return( mbedtls_platform_memequal( peer_crt->raw.p, crt_buf, crt_buf_len ) );
}
#elif defined(MBEDTLS_SSL_RENEGOTIATION)
#define PEER_CRT_CHANGED 0x75555555
@@ -7102,7 +7102,7 @@
if( ret != 0 )
return( PEER_CRT_CHANGED );
- return( mbedtls_platform_memcmp( tmp_digest, peer_cert_digest, digest_len ) );
+ return( mbedtls_platform_memequal( tmp_digest, peer_cert_digest, digest_len ) );
}
#endif /* MBEDTLS_SSL_KEEP_PEER_CERTIFICATE && MBEDTLS_SSL_RENEGOTIATION */
#endif /* MBEDTLS_SSL_RENEGOTIATION && MBEDTLS_SSL_CLI_C */
@@ -8350,8 +8350,8 @@
return( MBEDTLS_ERR_SSL_BAD_HS_FINISHED );
}
- if( mbedtls_platform_memcmp( ssl->in_msg + mbedtls_ssl_hs_hdr_len( ssl ),
- buf, hash_len ) != 0 )
+ if( mbedtls_platform_memequal( ssl->in_msg + mbedtls_ssl_hs_hdr_len( ssl ),
+ buf, hash_len ) != 0 )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad finished message" ) );
mbedtls_ssl_pend_fatal_alert( ssl,
@@ -12125,7 +12125,7 @@
for( cur = ssl->conf->alpn_list; *cur != NULL; cur++ )
{
if( strlen( *cur ) == alpn_len &&
- mbedtls_platform_memcmp( p, cur, alpn_len ) == 0 )
+ mbedtls_platform_memequal( p, cur, alpn_len ) == 0 )
{
ssl->alpn_chosen = *cur;
break;
diff --git a/library/x509.c b/library/x509.c
index 65f2ec6..f86e9e3 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -516,7 +516,7 @@
{
if( a->tag == b->tag &&
a->len == b->len &&
- mbedtls_platform_memcmp( a->p, b->p, b->len ) == 0 )
+ mbedtls_platform_memequal( a->p, b->p, b->len ) == 0 )
{
return( 0 );
}
@@ -605,7 +605,7 @@
goto exit;
if( oid[0].len != oid[1].len ||
- mbedtls_platform_memcmp( oid[0].p, oid[1].p, oid[1].len ) != 0 )
+ mbedtls_platform_memequal( oid[0].p, oid[1].p, oid[1].len ) != 0 )
{
return( 1 );
}
diff --git a/library/x509_crl.c b/library/x509_crl.c
index d295229..8af5de8 100644
--- a/library/x509_crl.c
+++ b/library/x509_crl.c
@@ -511,10 +511,10 @@
}
if( crl->sig_oid.len != sig_oid2.len ||
- mbedtls_platform_memcmp( crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len ) != 0 ||
+ mbedtls_platform_memequal( crl->sig_oid.p, sig_oid2.p, crl->sig_oid.len ) != 0 ||
sig_params1.len != sig_params2.len ||
( sig_params1.len != 0 &&
- mbedtls_platform_memcmp( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
+ mbedtls_platform_memequal( sig_params1.p, sig_params2.p, sig_params1.len ) != 0 ) )
{
mbedtls_x509_crl_free( crl );
return( MBEDTLS_ERR_X509_SIG_MISMATCH );
diff --git a/library/x509_crt.c b/library/x509_crt.c
index 43bb977..3b75bb5 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1322,7 +1322,7 @@
* signature field in the sequence tbsCertificate (Section 4.1.2.3).
*/
if( outer_sig_alg.len != inner_sig_alg_len ||
- mbedtls_platform_memcmp( outer_sig_alg.p, inner_sig_alg_start, inner_sig_alg_len ) != 0 )
+ mbedtls_platform_memequal( outer_sig_alg.p, inner_sig_alg_start, inner_sig_alg_len ) != 0 )
{
return( MBEDTLS_ERR_X509_SIG_MISMATCH );
}
@@ -2594,7 +2594,7 @@
return( 1 );
}
- if( data_len == cb_ctx->oid_len && mbedtls_platform_memcmp( data, cb_ctx->oid,
+ if( data_len == cb_ctx->oid_len && mbedtls_platform_memequal( data, cb_ctx->oid,
data_len ) == 0 )
{
return( 1 );
@@ -2652,7 +2652,7 @@
while( cur != NULL && cur->serial.len != 0 )
{
if( serial_len == cur->serial.len &&
- mbedtls_platform_memcmp( serial, cur->serial.p, serial_len ) == 0 )
+ mbedtls_platform_memequal( serial, cur->serial.p, serial_len ) == 0 )
{
if( mbedtls_x509_time_is_past( &cur->revocation_date ) )
return( 1 );
@@ -3191,7 +3191,7 @@
for( cur = trust_ca; cur != NULL; cur = cur->next )
{
if( crt->raw.len == cur->raw.len &&
- mbedtls_platform_memcmp( crt->raw.p, cur->raw.p, crt->raw.len ) == 0 )
+ mbedtls_platform_memequal( crt->raw.p, cur->raw.p, crt->raw.len ) == 0 )
{
return( 0 );
}