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

Add SM3 #5495

Merged
merged 1 commit into from
Jun 29, 2024
Merged

Add SM3 #5495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions doc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,6 +326,8 @@ Major changes from 1.9.0-jumbo-1 (May 2019) in this bleeding-edge version:
- External mode compiler: Compile-time evaluate most constant subexpressions.
[Solar; 2024]

- Added support for SM3. [SamuraiOcto; 2024]


Major changes from 1.8.0-jumbo-1 (December 2014) to 1.9.0-jumbo-1 (May 2019):

Expand Down
5 changes: 5 additions & 0 deletions src/dynamic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ typedef struct DYNAMIC_Constants_t
#define MGF__KECCAK_512 0x28
#define MGF__KECCAK_224 0x29
#define MGF__KECCAK_384 0x2a
#define MGF__SM3 0x2b
// LARGE_HASH_EDIT_POINT

// These are the 'flags' that specify certain characterstics of the format.
Expand Down Expand Up @@ -168,6 +169,7 @@ typedef struct DYNAMIC_Constants_t
#define MGF_SALT_AS_HEX_KECCAK_512 ((((uint64_t)MGF__KECCAK_512)<<56)|MGF_SALT_AS_HEX)
#define MGF_SALT_AS_HEX_KECCAK_224 ((((uint64_t)MGF__KECCAK_224)<<56)|MGF_SALT_AS_HEX)
#define MGF_SALT_AS_HEX_KECCAK_384 ((((uint64_t)MGF__KECCAK_384)<<56)|MGF_SALT_AS_HEX)
#define MGF_SALT_AS_HEX_SM3 ((((uint64_t)MGF__SM3 )<<56)|MGF_SALT_AS_HEX)
// LARGE_HASH_EDIT_POINT

#define MGF_INPBASE64_4x6 0x00000200
Expand Down Expand Up @@ -253,6 +255,7 @@ typedef struct DYNAMIC_Constants_t
#define MGF_KEYS_BASE16_IN1_KECCAK_512 ((((uint64_t)MGF__KECCAK_512)<<56)|MGF_KEYS_BASE16_IN1)
#define MGF_KEYS_BASE16_IN1_KECCAK_224 ((((uint64_t)MGF__KECCAK_224)<<56)|MGF_KEYS_BASE16_IN1)
#define MGF_KEYS_BASE16_IN1_KECCAK_384 ((((uint64_t)MGF__KECCAK_384)<<56)|MGF_KEYS_BASE16_IN1)
#define MGF_KEYS_BASE16_IN1_SM3 ((((uint64_t)MGF__SM3 )<<56)|MGF_KEYS_BASE16_IN1)
// LARGE_HASH_EDIT_POINT

#define MGF_KEYS_BASE16_IN1_Offset32 0x00000008 // deprecated (use the _MD5 version)
Expand Down Expand Up @@ -301,6 +304,7 @@ typedef struct DYNAMIC_Constants_t
#define MGF_KEYS_BASE16_IN1_Offset_KECCAK_512 ((((uint64_t)MGF__KECCAK_512)<<56)|MGF_KEYS_BASE16_IN1_Offset32)
#define MGF_KEYS_BASE16_IN1_Offset_KECCAK_224 ((((uint64_t)MGF__KECCAK_224)<<56)|MGF_KEYS_BASE16_IN1_Offset32)
#define MGF_KEYS_BASE16_IN1_Offset_KECCAK_384 ((((uint64_t)MGF__KECCAK_384)<<56)|MGF_KEYS_BASE16_IN1_Offset32)
#define MGF_KEYS_BASE16_IN1_Offset_SM3 ((((uint64_t)MGF__SM3 )<<56)|MGF_KEYS_BASE16_IN1_Offset32)
// LARGE_HASH_EDIT_POINT

//#define MGF_KEYS_BASE16_X86_IN1 0x00000010
Expand Down Expand Up @@ -640,6 +644,7 @@ LARGE_HASH_FUNCTION_DECLARAION(KECCAK_256);
LARGE_HASH_FUNCTION_DECLARAION(KECCAK_512);
LARGE_HASH_FUNCTION_DECLARAION(KECCAK_224);
LARGE_HASH_FUNCTION_DECLARAION(KECCAK_384);
LARGE_HASH_FUNCTION_DECLARAION(SM3);
// LARGE_HASH_EDIT_POINT

// These dump the raw crypt back into input (only at the head of it).
Expand Down
240 changes: 239 additions & 1 deletion src/dynamic_big_crypt_generated.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* The source for this file AUTO-GENERATED on:
* Tue Dec 19 18:30:50 CET 2023
* Fri Jun 14 04:05:32 PM EDT 2024
*
* NOTE. This file IS 100% auto-generated code.
*
Expand Down Expand Up @@ -171,6 +171,8 @@
#define SHA3_384_Init(hash) Keccak_HashInitialize(hash, 832, 768, 384, 0x06)
#define SHA3_512_Init(hash) Keccak_HashInitialize(hash, 576, 1024, 512, 0x06)

#include "sm3.h"
#define sm3_final(a,b) sm3_final(b,a)

#ifdef _OPENMP
#include <omp.h>
Expand Down Expand Up @@ -12687,4 +12689,240 @@ void DynamicFunc__SKEIN512_crypt_input2_to_output1_FINAL(DYNA_OMP_PARAMS) {
}
}

/***********************************************************************
* This section of the file auto-generated by dynamic_big_crypt_hash.cin
* being run through dynamic_big_crypt_chopper.pl with this command line
* ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SM3 PARAHASH=SM3 BIN_SZ=32 BIN_REAL_SZ=32 BE_HASH=0 JSWAPH= JSWAPT=; HASH_CTX=sm3_ctx HASH_Init=sm3_init HASH_Update=sm3_update HASH_Final=sm3_final SSEBody= SSE_LIMBS=0 SSE_ONLY_LIMBS= SSEFLAGS= DEFINED=TRUNC_TO16 UNDEFINED=SIMD_PARA_SM3
***********************************************************************/


/*****************************************************************************
**** SM3 functions This code generated from dynamic_big_crypt_hash.cin
**** !!!!!!!!!!!!DO NOT edit the code in this generated file!!!!!!!!!!!!!!
**** It is regenerated at make time, so changes to this file will be lost.
**** Any issues found MUST be fixed properly in dynamic_big_crypt_hash.cin
**** and not in this file. Then make regenerates this file with the fixes.
****************************************************************************/
#define SM3_LOOPS 1
static const uint32_t SM3_inc = 1;

inline static void DoSM3_crypt_f(void *in, uint32_t len, void *out) {
union xx { unsigned char u[32]; uint32_t a[32/sizeof(uint32_t)]; } u;
unsigned char *crypt_out=u.u;
sm3_ctx ctx;
sm3_init(&ctx);
sm3_update(&ctx, in, len);
sm3_final(crypt_out, &ctx);
memcpy(out, crypt_out, 16);
}

inline static void DoSM3_crypt(void *in, uint32_t ilen, void *out, uint32_t *tot_len, uint32_t tid) {
unsigned char crypt_out[32];
sm3_ctx ctx;
sm3_init(&ctx);
sm3_update(&ctx, in, ilen);
sm3_final(crypt_out, &ctx);
if (eLargeOut_get(tid) == eBase16) {
// since this is the usual, we avoid the extra overhead of large_hash_output, and go directly to the hex_out.
hex_out_buf(crypt_out, &(((unsigned char*)out)[*tot_len]), 32);
*tot_len += 32*2;
} else
*tot_len += large_hash_output(crypt_out, &(((unsigned char*)out)[*tot_len]), 32, tid);
}
inline static void DoSM3_crypt_only(void *in, uint32_t ilen, void *out)
{
sm3_ctx ctx;
sm3_init(&ctx);
sm3_update(&ctx, in, ilen);
sm3_final(out, &ctx);
}

void DynamicFunc__SM3_crypt_input1_append_input2(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x2.b2, &(total_len2_X86[i]), tid);
else
#endif
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x1.b, &(total_len2_X86[i]), tid);
}
}

void DynamicFunc__SM3_crypt_input2_append_input1(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x2.b2, &(total_len_X86[i]), tid);
else
#endif
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x1.b, &(total_len_X86[i]), tid);
}
}

void DynamicFunc__SM3_crypt_input1_at_offset_input2(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = nLargeOff_get(tid);
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x1.b, &x, tid);
}
}

void DynamicFunc__SM3_crypt_input2_at_offset_input1(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = nLargeOff_get(tid);
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x1.b, &x, tid);
}
}

void DynamicFunc__SM3_crypt_input1_at_offset_input1(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = nLargeOff_get(tid);
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], input_buf_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], input_buf_X86[i>>MD5_X2].x1.b, &x, tid);
}
}

void DynamicFunc__SM3_crypt_input2_at_offset_input2(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = nLargeOff_get(tid);
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], input_buf2_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], input_buf2_X86[i>>MD5_X2].x1.b, &x, tid);
}
}

void DynamicFunc__SM3_crypt_input1_overwrite_input1(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = 0;
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], input_buf_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], input_buf_X86[i>>MD5_X2].x1.b, &x, tid);
total_len_X86[i] = x;
}
}

void DynamicFunc__SM3_crypt_input1_overwrite_input2(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = 0;
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], input_buf2_X86[i>>MD5_X2].x1.b, &x, tid);
total_len2_X86[i] = x;
}
}

void DynamicFunc__SM3_crypt_input2_overwrite_input1(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = 0;
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], input_buf_X86[i>>MD5_X2].x1.b, &x, tid);
total_len_X86[i] = x;
}
}

void DynamicFunc__SM3_crypt_input2_overwrite_input2(DYNA_OMP_PARAMS) {
PRELIM_W_TID;
for (; i < til; i += SM3_inc) {
uint32_t x = 0;
#if (MD5_X2)
if (i & 1)
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], input_buf2_X86[i>>MD5_X2].x2.b2, &x, tid);
else
#endif
DoSM3_crypt(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], input_buf2_X86[i>>MD5_X2].x1.b, &x, tid);
total_len2_X86[i] = x;
}
}

inline static void _Dyna__SM3_crypt_inputX_to_outputY(uint32_t X, uint32_t Y, uint32_t i, uint32_t til) {
dynamic_BHO[--Y].width = 32; // Y was 1 based for ease of reading.
for (; i < til; i += SM3_inc) {
dynamic_BHO[Y].BE = 0; // CTX requires no swapping.
dynamic_BHO[Y].bits = 32;
dynamic_BHO[Y].mixed_SIMD=0;
if (X==1) {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt_only(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], dynamic_BHO[Y].dat[i].b);
else
#endif
DoSM3_crypt_only(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], dynamic_BHO[Y].dat[i].b);
} else {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt_only(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], dynamic_BHO[Y].dat[i].b);
else
#endif
DoSM3_crypt_only(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], dynamic_BHO[Y].dat[i].b);
}
}
}
void DynamicFunc__SM3_crypt_input1_to_output1(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(1, 1, i, til); }
void DynamicFunc__SM3_crypt_input1_to_output2(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(1, 2, i, til); }
void DynamicFunc__SM3_crypt_input1_to_output3(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(1, 3, i, til); }
void DynamicFunc__SM3_crypt_input1_to_output4(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(1, 4, i, til); }
void DynamicFunc__SM3_crypt_input2_to_output1(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(2, 1, i, til); }
void DynamicFunc__SM3_crypt_input2_to_output2(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(2, 2, i, til); }
void DynamicFunc__SM3_crypt_input2_to_output3(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(2, 3, i, til); }
void DynamicFunc__SM3_crypt_input2_to_output4(DYNA_OMP_PARAMS) { PRELIM_NO_TID; _Dyna__SM3_crypt_inputX_to_outputY(2, 4, i, til); }

void DynamicFunc__SM3_crypt_input1_to_output1_FINAL(DYNA_OMP_PARAMS) {
PRELIM_NO_TID;
for (; i < til; i += SM3_inc) {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt_f(input_buf_X86[i>>MD5_X2].x2.b2, total_len_X86[i], crypt_key_X86[i>>MD5_X2].x2.b2);
else
#endif
DoSM3_crypt_f(input_buf_X86[i>>MD5_X2].x1.b, total_len_X86[i], crypt_key_X86[i>>MD5_X2].x1.b);
}
}

void DynamicFunc__SM3_crypt_input2_to_output1_FINAL(DYNA_OMP_PARAMS) {
PRELIM_NO_TID;
for (; i < til; i += SM3_inc) {
#if (MD5_X2)
if (i & 1)
DoSM3_crypt_f(input_buf2_X86[i>>MD5_X2].x2.b2, total_len2_X86[i], crypt_key_X86[i>>MD5_X2].x2.b2);
else
#endif
DoSM3_crypt_f(input_buf2_X86[i>>MD5_X2].x1.b, total_len2_X86[i], crypt_key_X86[i>>MD5_X2].x1.b);
}
}

#endif // DYNAMIC_DISABLED
1 change: 1 addition & 0 deletions src/dynamic_big_crypt_generator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ perl ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SKEIN224 PARAHASH=SKEIN224
perl ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SKEIN256 PARAHASH=SKEIN256 BIN_SZ=64 BIN_REAL_SZ=32 BE_HASH=0 JSWAPH=' ' JSWAPT=';' HASH_CTX=sph_skein256_context HASH_Init=sph_skein256_init HASH_Update=sph_skein256 HASH_Final=sph_skein256_close SSEBody='' SSE_LIMBS=0 SSE_ONLY_LIMBS='' SSEFLAGS=' ' DEFINED=TRUNC_TO16 UNDEFINED=SIMD_PARA_SKEIN256 < dynamic_big_crypt_hash.cin >> xxx
perl ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SKEIN384 PARAHASH=SKEIN384 BIN_SZ=64 BIN_REAL_SZ=48 BE_HASH=0 JSWAPH=' ' JSWAPT=';' HASH_CTX=sph_skein384_context HASH_Init=sph_skein384_init HASH_Update=sph_skein384 HASH_Final=sph_skein384_close SSEBody='' SSE_LIMBS=0 SSE_ONLY_LIMBS='' SSEFLAGS=' ' DEFINED=TRUNC_TO16 UNDEFINED=SIMD_PARA_SKEIN384 < dynamic_big_crypt_hash.cin >> xxx
perl ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SKEIN512 PARAHASH=SKEIN512 BIN_SZ=64 BIN_REAL_SZ=64 BE_HASH=0 JSWAPH=' ' JSWAPT=';' HASH_CTX=sph_skein512_context HASH_Init=sph_skein512_init HASH_Update=sph_skein512 HASH_Final=sph_skein512_close SSEBody='' SSE_LIMBS=0 SSE_ONLY_LIMBS='' SSEFLAGS=' ' DEFINED=TRUNC_TO16 UNDEFINED=SIMD_PARA_SKEIN512 < dynamic_big_crypt_hash.cin >> xxx
perl ./dynamic_big_crypt_chopper.pl BITS=32 HASH=SM3 PARAHASH=SM3 BIN_SZ=32 BIN_REAL_SZ=32 BE_HASH=0 JSWAPH=' ' JSWAPT=';' HASH_CTX=sm3_ctx HASH_Init=sm3_init HASH_Update=sm3_update HASH_Final=sm3_final SSEBody='' SSE_LIMBS=0 SSE_ONLY_LIMBS='' SSEFLAGS=' ' DEFINED=TRUNC_TO16 UNDEFINED=SIMD_PARA_SM3 < dynamic_big_crypt_hash.cin >> xxx
# LARGE_HASH_EDIT_POINT

# now we close out the #define DYNAMIC_DISABLED started at the very top
Expand Down
2 changes: 2 additions & 0 deletions src/dynamic_big_crypt_header.cin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,8 @@
#define SHA3_384_Init(hash) Keccak_HashInitialize(hash, 832, 768, 384, 0x06)
#define SHA3_512_Init(hash) Keccak_HashInitialize(hash, 576, 1024, 512, 0x06)

#include "sm3.h"
#define sm3_final(a,b) sm3_final(b,a)

#ifdef _OPENMP
#include <omp.h>
Expand Down
Loading