Skip to content

Commit 4460d26

Browse files
PARKJIHOONandrewc-arm
authored andcommitted
Default use BEDTLS_SHA512_SMALLER for SW fallback
Signed-off-by: PARKJIHOON <[email protected]>
1 parent f9c4a51 commit 4460d26

File tree

1 file changed

+1
-37
lines changed

1 file changed

+1
-37
lines changed

features/mbedtls/targets/TARGET_Samsung/sha/sha512_alt.c

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,10 @@
8181
}
8282
#endif /* PUT_UINT64_BE */
8383

84-
#if defined(MBEDTLS_SHA512_SMALLER)
8584
static void sha512_put_uint64_be(uint64_t n, unsigned char *b, uint8_t i)
8685
{
8786
PUT_UINT64_BE(n, b, i);
8887
}
89-
#else
90-
#define sha512_put_uint64_be PUT_UINT64_BE
91-
#endif /* MBEDTLS_SHA512_SMALLER */
92-
9388

9489

9590
#include "string.h"
@@ -298,7 +293,7 @@ static const uint64_t K[80] = {
298293
UL64(0x4CC5D4BECB3E42B6), UL64(0x597F299CFC657E2A),
299294
UL64(0x5FCB6FAB3AD6FAEC), UL64(0x6C44198C4A475817)
300295
};
301-
#define MBEDTLS_SHA512_SMALLER 1
296+
302297
int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
303298
const unsigned char data[128])
304299
{
@@ -333,7 +328,6 @@ int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
333328
A[i] = ctx->state[i];
334329
}
335330

336-
#if defined(MBEDTLS_SHA512_SMALLER)
337331
for (i = 0; i < 80; i++) {
338332
if (i < 16) {
339333
GET_UINT64_BE(W[i], data, i << 3);
@@ -354,36 +348,6 @@ int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx,
354348
A[1] = A[0];
355349
A[0] = temp1;
356350
}
357-
#else /* MBEDTLS_SHA512_SMALLER */
358-
for (i = 0; i < 16; i++) {
359-
GET_UINT64_BE(W[i], data, i << 3);
360-
}
361-
362-
for (; i < 80; i++) {
363-
W[i] = S1(W[i - 2]) + W[i - 7] +
364-
S0(W[i - 15]) + W[i - 16];
365-
}
366-
367-
i = 0;
368-
do {
369-
P(A[0], A[1], A[2], A[3], A[4], A[5], A[6], A[7], W[i], K[i]);
370-
i++;
371-
P(A[7], A[0], A[1], A[2], A[3], A[4], A[5], A[6], W[i], K[i]);
372-
i++;
373-
P(A[6], A[7], A[0], A[1], A[2], A[3], A[4], A[5], W[i], K[i]);
374-
i++;
375-
P(A[5], A[6], A[7], A[0], A[1], A[2], A[3], A[4], W[i], K[i]);
376-
i++;
377-
P(A[4], A[5], A[6], A[7], A[0], A[1], A[2], A[3], W[i], K[i]);
378-
i++;
379-
P(A[3], A[4], A[5], A[6], A[7], A[0], A[1], A[2], W[i], K[i]);
380-
i++;
381-
P(A[2], A[3], A[4], A[5], A[6], A[7], A[0], A[1], W[i], K[i]);
382-
i++;
383-
P(A[1], A[2], A[3], A[4], A[5], A[6], A[7], A[0], W[i], K[i]);
384-
i++;
385-
} while (i < 80);
386-
#endif /* MBEDTLS_SHA512_SMALLER */
387351

388352
for (i = 0; i < 8; i++) {
389353
ctx->state[i] += A[i];

0 commit comments

Comments
 (0)