Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Performance Enhancements and Memory Footprint Reduction in mbedtls_internal_sha(256|512)_process_c() #9542

Open
wants to merge 10 commits into
base: development
Choose a base branch
from
+191 −55
Open

Performance Enhancements and Memory Footprint Reduction in mbedtls_internal_sha(256|512)_process_c() #9542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
403f116
[opt_perf] (sha256.c) :: Recicled word schedule loop for immediate us…
manoel-serafim Sep 5, 2024
f717d76
(opt_perf) [sha256.c] :: Initiallization unrrolled for uses outside o…
manoel-serafim Sep 5, 2024
7dc5bcc
(opt_perf) [sha256.c] :: Instead of adding to the index references of…
manoel-serafim Sep 5, 2024
659c0ea
(opt_perf) [sha256.c] :: Intermediate digest final compression additi…
manoel-serafim Sep 5, 2024
f8f8fe2
(opt_perf) [sha256.c] :: Made MBEDTLS_SHA256_SMALLER even smaller by …
manoel-serafim Sep 5, 2024
f443f5d
(opt_perf) [sha256.c] :: Shifting instead of multiplying
manoel-serafim Sep 5, 2024
a2b149a
(opt_perf&footprint) [sha512.c] :: Made the same changes of sha256 to…
manoel-serafim Sep 5, 2024
a6c6699
(fact) [sha512.c + sha256.c] :: Get rid of trailing whitespaces
manoel-serafim Sep 12, 2024
be97e29
(fact_pr) [*.bak] Removes all .bak files from traking
manoel-serafim Sep 12, 2024
8817a17
(fact) [sha256.c, sha512.c] :: uncrustified the code
manoel-serafim Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 75 additions & 33 deletions tf-psa-crypto/drivers/builtin/src/sha256.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,75 +479,117 @@ static int mbedtls_internal_sha256_process_c(mbedtls_sha256_context *ctx,

unsigned int i;

#if defined(MBEDTLS_SHA256_SMALLER)
for (i = 0; i < 8; i++) {
local.A[i] = ctx->state[i];
}

#if defined(MBEDTLS_SHA256_SMALLER)
unsigned int j;
for (i = 0; i < 64; i++) {
if (i < 16) {
local.W[i] = MBEDTLS_GET_UINT32_BE(data, 4 * i);
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
} else {
R(i);
}

P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], local.W[i], K[i]);

local.temp1 = local.A[7]; local.A[7] = local.A[6];
local.A[6] = local.A[5]; local.A[5] = local.A[4];
local.A[4] = local.A[3]; local.A[3] = local.A[2];
local.A[2] = local.A[1]; local.A[1] = local.A[0];
local.temp1 = local.A[7];
for (j = 7; j > 0; --j) {
local.A[j] = local.A[j-1];
}
local.A[0] = local.temp1;
}
#else /* MBEDTLS_SHA256_SMALLER */
for (i = 0; i < 16; i++) {
local.W[i] = MBEDTLS_GET_UINT32_BE(data, 4 * i);

for (i = 0; i < 8; i++) {
ctx->state[i] += local.A[i];
}

for (i = 0; i < 16; i += 8) {
#else /* MBEDTLS_SHA256_SMALLER */

local.A[0] = ctx->state[0];
local.A[1] = ctx->state[1];
local.A[2] = ctx->state[2];
local.A[3] = ctx->state[3];
local.A[4] = ctx->state[4];
local.A[5] = ctx->state[5];
local.A[6] = ctx->state[6];
local.A[7] = ctx->state[7];

i = 0;
do {
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], local.W[i+0], K[i+0]);
local.A[5], local.A[6], local.A[7], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[7], local.A[0], local.A[1], local.A[2], local.A[3],
local.A[4], local.A[5], local.A[6], local.W[i+1], K[i+1]);
local.A[4], local.A[5], local.A[6], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[6], local.A[7], local.A[0], local.A[1], local.A[2],
local.A[3], local.A[4], local.A[5], local.W[i+2], K[i+2]);
local.A[3], local.A[4], local.A[5], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[5], local.A[6], local.A[7], local.A[0], local.A[1],
local.A[2], local.A[3], local.A[4], local.W[i+3], K[i+3]);
local.A[2], local.A[3], local.A[4], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[4], local.A[5], local.A[6], local.A[7], local.A[0],
local.A[1], local.A[2], local.A[3], local.W[i+4], K[i+4]);
local.A[1], local.A[2], local.A[3], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[3], local.A[4], local.A[5], local.A[6], local.A[7],
local.A[0], local.A[1], local.A[2], local.W[i+5], K[i+5]);
local.A[0], local.A[1], local.A[2], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[2], local.A[3], local.A[4], local.A[5], local.A[6],
local.A[7], local.A[0], local.A[1], local.W[i+6], K[i+6]);
local.A[7], local.A[0], local.A[1], local.W[i], K[i]);
++i;
local.W[i] = MBEDTLS_GET_UINT32_BE(data, i << 2);
P(local.A[1], local.A[2], local.A[3], local.A[4], local.A[5],
local.A[6], local.A[7], local.A[0], local.W[i+7], K[i+7]);
}
local.A[6], local.A[7], local.A[0], local.W[i], K[i]);
++i;
} while (i < 16);

for (i = 16; i < 64; i += 8) {
do {
P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], R(i+0), K[i+0]);
local.A[5], local.A[6], local.A[7], R(i), K[i]);
++i;
P(local.A[7], local.A[0], local.A[1], local.A[2], local.A[3],
local.A[4], local.A[5], local.A[6], R(i+1), K[i+1]);
local.A[4], local.A[5], local.A[6], R(i), K[i]);
++i;
P(local.A[6], local.A[7], local.A[0], local.A[1], local.A[2],
local.A[3], local.A[4], local.A[5], R(i+2), K[i+2]);
local.A[3], local.A[4], local.A[5], R(i), K[i]);
++i;
P(local.A[5], local.A[6], local.A[7], local.A[0], local.A[1],
local.A[2], local.A[3], local.A[4], R(i+3), K[i+3]);
local.A[2], local.A[3], local.A[4], R(i), K[i]);
++i;
P(local.A[4], local.A[5], local.A[6], local.A[7], local.A[0],
local.A[1], local.A[2], local.A[3], R(i+4), K[i+4]);
local.A[1], local.A[2], local.A[3], R(i), K[i]);
++i;
P(local.A[3], local.A[4], local.A[5], local.A[6], local.A[7],
local.A[0], local.A[1], local.A[2], R(i+5), K[i+5]);
local.A[0], local.A[1], local.A[2], R(i), K[i]);
++i;
P(local.A[2], local.A[3], local.A[4], local.A[5], local.A[6],
local.A[7], local.A[0], local.A[1], R(i+6), K[i+6]);
local.A[7], local.A[0], local.A[1], R(i), K[i]);
++i;
P(local.A[1], local.A[2], local.A[3], local.A[4], local.A[5],
local.A[6], local.A[7], local.A[0], R(i+7), K[i+7]);
}
local.A[6], local.A[7], local.A[0], R(i), K[i]);
++i;
} while (i < 64);

ctx->state[0] += local.A[0];
ctx->state[1] += local.A[1];
ctx->state[2] += local.A[2];
ctx->state[3] += local.A[3];
ctx->state[4] += local.A[4];
ctx->state[5] += local.A[5];
ctx->state[6] += local.A[6];
ctx->state[7] += local.A[7];
#endif /* MBEDTLS_SHA256_SMALLER */

for (i = 0; i < 8; i++) {
ctx->state[i] += local.A[i];
}

/* Zeroise buffers and variables to clear sensitive data from memory. */
mbedtls_platform_zeroize(&local, sizeof(local));

Expand Down
138 changes: 116 additions & 22 deletions tf-psa-crypto/drivers/builtin/src/sha512.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,12 @@ static int mbedtls_internal_sha512_process_c(mbedtls_sha512_context *ctx,
}

#if defined(MBEDTLS_SHA512_SMALLER)
unsigned int j;

for (i = 0; i < 8; i++) {
local.A[i] = ctx->state[i];
}

for (i = 0; i < 80; i++) {
if (i < 16) {
local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
Expand All @@ -624,46 +630,134 @@ static int mbedtls_internal_sha512_process_c(mbedtls_sha512_context *ctx,
P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], local.W[i], K[i]);

local.temp1 = local.A[7]; local.A[7] = local.A[6];
local.A[6] = local.A[5]; local.A[5] = local.A[4];
local.A[4] = local.A[3]; local.A[3] = local.A[2];
local.A[2] = local.A[1]; local.A[1] = local.A[0];
local.temp1 = local.A[7];
for (j = 7; j > 0; --j) {
local.A[j] = local.A[j-1];
}
local.A[0] = local.temp1;
}
#else /* MBEDTLS_SHA512_SMALLER */
for (i = 0; i < 16; i++) {
local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
}

for (; i < 80; i++) {
local.W[i] = S1(local.W[i - 2]) + local.W[i - 7] +
S0(local.W[i - 15]) + local.W[i - 16];
for (i = 0; i < 8; i++) {
ctx->state[i] += local.A[i];
}

#else /* MBEDTLS_SHA512_SMALLER */

local.A[0] = ctx->state[0];
local.A[1] = ctx->state[1];
local.A[2] = ctx->state[2];
local.A[3] = ctx->state[3];
local.A[4] = ctx->state[4];
local.A[5] = ctx->state[5];
local.A[6] = ctx->state[6];
local.A[7] = ctx->state[7];

i = 0;
do {
local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], local.W[i], K[i]); i++;
local.A[5], local.A[6], local.A[7], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[7], local.A[0], local.A[1], local.A[2], local.A[3],
local.A[4], local.A[5], local.A[6], local.W[i], K[i]); i++;
local.A[4], local.A[5], local.A[6], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[6], local.A[7], local.A[0], local.A[1], local.A[2],
local.A[3], local.A[4], local.A[5], local.W[i], K[i]); i++;
local.A[3], local.A[4], local.A[5], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[5], local.A[6], local.A[7], local.A[0], local.A[1],
local.A[2], local.A[3], local.A[4], local.W[i], K[i]); i++;
local.A[2], local.A[3], local.A[4], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[4], local.A[5], local.A[6], local.A[7], local.A[0],
local.A[1], local.A[2], local.A[3], local.W[i], K[i]); i++;
local.A[1], local.A[2], local.A[3], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[3], local.A[4], local.A[5], local.A[6], local.A[7],
local.A[0], local.A[1], local.A[2], local.W[i], K[i]); i++;
local.A[0], local.A[1], local.A[2], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[2], local.A[3], local.A[4], local.A[5], local.A[6],
local.A[7], local.A[0], local.A[1], local.W[i], K[i]); i++;
local.A[7], local.A[0], local.A[1], local.W[i], K[i]);
++i;

local.W[i] = MBEDTLS_GET_UINT64_BE(data, i << 3);
P(local.A[1], local.A[2], local.A[3], local.A[4], local.A[5],
local.A[6], local.A[7], local.A[0], local.W[i], K[i]); i++;
local.A[6], local.A[7], local.A[0], local.W[i], K[i]);
++i;

} while (i < 16);

do {

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[0], local.A[1], local.A[2], local.A[3], local.A[4],
local.A[5], local.A[6], local.A[7], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[7], local.A[0], local.A[1], local.A[2], local.A[3],
local.A[4], local.A[5], local.A[6], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[6], local.A[7], local.A[0], local.A[1], local.A[2],
local.A[3], local.A[4], local.A[5], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[5], local.A[6], local.A[7], local.A[0], local.A[1],
local.A[2], local.A[3], local.A[4], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[4], local.A[5], local.A[6], local.A[7], local.A[0],
local.A[1], local.A[2], local.A[3], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[3], local.A[4], local.A[5], local.A[6], local.A[7],
local.A[0], local.A[1], local.A[2], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[2], local.A[3], local.A[4], local.A[5], local.A[6],
local.A[7], local.A[0], local.A[1], local.W[i], K[i]);
++i;

local.W[i] =
(S1(local.W[i - 2]) + local.W[i - 7] + S0(local.W[i - 15]) + local.W[i - 16]);
P(local.A[1], local.A[2], local.A[3], local.A[4], local.A[5],
local.A[6], local.A[7], local.A[0], local.W[i], K[i]);
++i;

} while (i < 80);

ctx->state[0] += local.A[0];
ctx->state[1] += local.A[1];
ctx->state[2] += local.A[2];
ctx->state[3] += local.A[3];
ctx->state[4] += local.A[4];
ctx->state[5] += local.A[5];
ctx->state[6] += local.A[6];
ctx->state[7] += local.A[7];
#endif /* MBEDTLS_SHA512_SMALLER */

for (i = 0; i < 8; i++) {
ctx->state[i] += local.A[i];
}

/* Zeroise buffers and variables to clear sensitive data from memory. */
mbedtls_platform_zeroize(&local, sizeof(local));
Expand Down