提交 db44a69a 编写于 作者: C Charalampos Mitrodimas 提交者: Hugo Landau

crypto: sha512: Add mechanism to keep C code as fallback for SHA512_ASM

Currently, architectures have to decide if they want the C code or an
arch-specific implementation. Let's add a macro, that allows to keep the C
code even if SHA512_ASM is defined (but rename it from sha512_block_data_order
to sha512_block_data_order_c). The macro INCLUDE_C_SHA512 can be used by
architectures, that want the C code as fallback code.
Signed-off-by: NCharalampos Mitrodimas <charalampos.mitrodimas@vrull.eu>
Signed-off-by: NChristoph Müllner <christoph.muellner@vrull.eu>
Reviewed-by: NTomas Mraz <tomas@openssl.org>
Reviewed-by: NPaul Dale <pauli@openssl.org>
Reviewed-by: NHugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21923)
上级 17073066
......@@ -149,6 +149,10 @@ int SHA512_Init(SHA512_CTX *c)
#ifndef SHA512_ASM
static
#else
# ifdef INCLUDE_C_SHA512
void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num);
# endif
#endif
void sha512_block_data_order(SHA512_CTX *ctx, const void *in, size_t num);
......@@ -338,7 +342,7 @@ void SHA512_Transform(SHA512_CTX *c, const unsigned char *data)
sha512_block_data_order(c, data, 1);
}
#ifndef SHA512_ASM
#if !defined(SHA512_ASM) || defined(INCLUDE_C_SHA512)
static const SHA_LONG64 K512[80] = {
U64(0x428a2f98d728ae22), U64(0x7137449123ef65cd),
U64(0xb5c0fbcfec4d3b2f), U64(0xe9b5dba58189dbbc),
......@@ -737,8 +741,12 @@ static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
T1 = X[(j)&0x0f] += s0 + s1 + X[(j+9)&0x0f]; \
ROUND_00_15(i+j,a,b,c,d,e,f,g,h); } while (0)
#ifdef INCLUDE_C_SHA512
void sha512_block_data_order_c(SHA512_CTX *ctx, const void *in, size_t num)
#else
static void sha512_block_data_order(SHA512_CTX *ctx, const void *in,
size_t num)
#endif
{
const SHA_LONG64 *W = in;
SHA_LONG64 a, b, c, d, e, f, g, h, s0, s1, T1;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册