mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-01 04:20:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use functions in alignment.h to get value

Browse Source 
Refactor code using get functions from alignment.h to
read values.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2023-05-23 17:34:33 +01:00
parent d7d1039755
commit f9f0ba8211
3 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/ssl_cookie.c
View File

@ -364,10 +364,7 @@ int mbedtls_ssl_cookie_check(void *p_ctx,
cur_time = ctx->serial; cur_time = ctx->serial;
#endif #endif
cookie_time = ((unsigned long) cookie[0] << 24) | cookie_time = (unsigned long) MBEDTLS_GET_UINT32_BE(cookie, 0);
((unsigned long) cookie[1] << 16) |
((unsigned long) cookie[2] << 8) |
((unsigned long) cookie[3]);
if (ctx->timeout != 0 && cur_time - cookie_time > ctx->timeout) { if (ctx->timeout != 0 && cur_time - cookie_time > ctx->timeout) {
ret = -1; ret = -1;

47
library/ssl_tls.c
View File

@ -4613,10 +4613,7 @@ static int ssl_context_load(mbedtls_ssl_context *ssl,
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
session_len = ((size_t) p[0] << 24) | session_len = MBEDTLS_GET_UINT32_BE(p, 0);
((size_t) p[1] << 16) |
((size_t) p[2] << 8) |
((size_t) p[3]);
p += 4; p += 4;
/* This has been allocated by ssl_handshake_init(), called by /* This has been allocated by ssl_handshake_init(), called by
@ -4711,10 +4708,7 @@ static int ssl_context_load(mbedtls_ssl_context *ssl,
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
ssl->badmac_seen = ((uint32_t) p[0] << 24) | ssl->badmac_seen = MBEDTLS_GET_UINT32_BE(p, 0);
((uint32_t) p[1] << 16) |
((uint32_t) p[2] << 8) |
((uint32_t) p[3]);
p += 4; p += 4;
#if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY) #if defined(MBEDTLS_SSL_DTLS_ANTI_REPLAY)
@ -4722,24 +4716,10 @@ static int ssl_context_load(mbedtls_ssl_context *ssl,
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
ssl->in_window_top = ((uint64_t) p[0] << 56) | ssl->in_window_top = MBEDTLS_GET_UINT64_BE(p, 0);
((uint64_t) p[1] << 48) |
((uint64_t) p[2] << 40) |
((uint64_t) p[3] << 32) |
((uint64_t) p[4] << 24) |
((uint64_t) p[5] << 16) |
((uint64_t) p[6] << 8) |
((uint64_t) p[7]);
p += 8; p += 8;
ssl->in_window = ((uint64_t) p[0] << 56) | ssl->in_window = MBEDTLS_GET_UINT64_BE(p, 0);
((uint64_t) p[1] << 48) |
((uint64_t) p[2] << 40) |
((uint64_t) p[3] << 32) |
((uint64_t) p[4] << 24) |
((uint64_t) p[5] << 16) |
((uint64_t) p[6] << 8) |
((uint64_t) p[7]);
p += 8; p += 8;
#endif /* MBEDTLS_SSL_DTLS_ANTI_REPLAY */ #endif /* MBEDTLS_SSL_DTLS_ANTI_REPLAY */
@ -9102,14 +9082,7 @@ static int ssl_tls12_session_load(mbedtls_ssl_session *session,
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
start = ((uint64_t) p[0] << 56) | start = MBEDTLS_GET_UINT64_BE(p, 0);
((uint64_t) p[1] << 48) |
((uint64_t) p[2] << 40) |
((uint64_t) p[3] << 32) |
((uint64_t) p[4] << 24) |
((uint64_t) p[5] << 16) |
((uint64_t) p[6] << 8) |
((uint64_t) p[7]);
p += 8; p += 8;
session->start = (time_t) start; session->start = (time_t) start;
@ -9132,10 +9105,7 @@ static int ssl_tls12_session_load(mbedtls_ssl_session *session,
memcpy(session->master, p, 48); memcpy(session->master, p, 48);
p += 48; p += 48;
session->verify_result = ((uint32_t) p[0] << 24) | session->verify_result = MBEDTLS_GET_UINT32_BE(p, 0);
((uint32_t) p[1] << 16) |
((uint32_t) p[2] << 8) |
((uint32_t) p[3]);
p += 4; p += 4;
/* Immediately clear invalid pointer values that have been read, in case /* Immediately clear invalid pointer values that have been read, in case
@ -9254,10 +9224,7 @@ static int ssl_tls12_session_load(mbedtls_ssl_session *session,
return MBEDTLS_ERR_SSL_BAD_INPUT_DATA; return MBEDTLS_ERR_SSL_BAD_INPUT_DATA;
} }
session->ticket_lifetime = ((uint32_t) p[0] << 24) | session->ticket_lifetime = MBEDTLS_GET_UINT32_BE(p, 0);
((uint32_t) p[1] << 16) |
((uint32_t) p[2] << 8) |
((uint32_t) p[3]);
p += 4; p += 4;
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */

7
library/ssl_tls12_server.c
View File

@ -1088,9 +1088,7 @@ read_record_header:
#if defined(MBEDTLS_SSL_RENEGOTIATION) #if defined(MBEDTLS_SSL_RENEGOTIATION)
if (ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_IN_PROGRESS) { if (ssl->renego_status == MBEDTLS_SSL_RENEGOTIATION_IN_PROGRESS) {
/* This couldn't be done in ssl_prepare_handshake_record() */ /* This couldn't be done in ssl_prepare_handshake_record() */
unsigned int cli_msg_seq = (ssl->in_msg[4] << 8) | unsigned int cli_msg_seq = (unsigned int) MBEDTLS_GET_UINT16_BE(ssl->in_msg, 4);
ssl->in_msg[5];
if (cli_msg_seq != ssl->handshake->in_msg_seq) { if (cli_msg_seq != ssl->handshake->in_msg_seq) {
MBEDTLS_SSL_DEBUG_MSG(1, ("bad client hello message_seq: " MBEDTLS_SSL_DEBUG_MSG(1, ("bad client hello message_seq: "
"%u (expected %u)", cli_msg_seq, "%u (expected %u)", cli_msg_seq,
@ -1102,8 +1100,7 @@ read_record_header:
} else } else
#endif #endif
{ {
unsigned int cli_msg_seq = (ssl->in_msg[4] << 8) | unsigned int cli_msg_seq = (unsigned int) MBEDTLS_GET_UINT16_BE(ssl->in_msg, 4);
ssl->in_msg[5];
ssl->handshake->out_msg_seq = cli_msg_seq; ssl->handshake->out_msg_seq = cli_msg_seq;
ssl->handshake->in_msg_seq = cli_msg_seq + 1; ssl->handshake->in_msg_seq = cli_msg_seq + 1;
} }