Skip to content

Commit 9be24c7

Browse files
committed
SHA-256 & SHA-224 x86
1 parent beecdc1 commit 9be24c7

19 files changed

Lines changed: 1043 additions & 120 deletions

libtomcrypt_VS2008.vcproj

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -942,10 +942,26 @@
942942
RelativePath="src\hashes\sha2\sha224.c"
943943
>
944944
</File>
945+
<File
946+
RelativePath="src\hashes\sha2\sha224_desc.c"
947+
>
948+
</File>
949+
<File
950+
RelativePath="src\hashes\sha2\sha224_x86.c"
951+
>
952+
</File>
945953
<File
946954
RelativePath="src\hashes\sha2\sha256.c"
947955
>
948956
</File>
957+
<File
958+
RelativePath="src\hashes\sha2\sha256_desc.c"
959+
>
960+
</File>
961+
<File
962+
RelativePath="src\hashes\sha2\sha256_x86.c"
963+
>
964+
</File>
949965
<File
950966
RelativePath="src\hashes\sha2\sha384.c"
951967
>

makefile.mingw

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,21 +69,23 @@ src/hashes/blake2b.o src/hashes/blake2s.o src/hashes/chc/chc.o src/hashes/helper
6969
src/hashes/helper/hash_filehandle.o src/hashes/helper/hash_memory.o \
7070
src/hashes/helper/hash_memory_multi.o src/hashes/md2.o src/hashes/md4.o src/hashes/md5.o \
7171
src/hashes/rmd128.o src/hashes/rmd160.o src/hashes/rmd256.o src/hashes/rmd320.o src/hashes/sha1.o \
72-
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha256.o \
73-
src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o src/hashes/sha2/sha512_224.o \
74-
src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o src/hashes/tiger.o \
75-
src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o src/mac/blake2/blake2bmac_file.o \
76-
src/mac/blake2/blake2bmac_memory.o src/mac/blake2/blake2bmac_memory_multi.o \
77-
src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o src/mac/blake2/blake2smac_file.o \
78-
src/mac/blake2/blake2smac_memory.o src/mac/blake2/blake2smac_memory_multi.o \
79-
src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o src/mac/f9/f9_file.o src/mac/f9/f9_init.o \
80-
src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o src/mac/f9/f9_process.o src/mac/f9/f9_test.o \
81-
src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o \
82-
src/mac/hmac/hmac_memory_multi.o src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o \
83-
src/mac/omac/omac_done.o src/mac/omac/omac_file.o src/mac/omac/omac_init.o src/mac/omac/omac_memory.o \
84-
src/mac/omac/omac_memory_multi.o src/mac/omac/omac_process.o src/mac/omac/omac_test.o \
85-
src/mac/pelican/pelican.o src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o \
86-
src/mac/pmac/pmac_done.o src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
72+
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha224_desc.o \
73+
src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
74+
src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
75+
src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
76+
src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
77+
src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
78+
src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
79+
src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \
80+
src/mac/blake2/blake2smac_memory_multi.o src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o \
81+
src/mac/f9/f9_file.o src/mac/f9/f9_init.o src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o \
82+
src/mac/f9/f9_process.o src/mac/f9/f9_test.o src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o \
83+
src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o src/mac/hmac/hmac_memory_multi.o \
84+
src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o src/mac/omac/omac_done.o src/mac/omac/omac_file.o \
85+
src/mac/omac/omac_init.o src/mac/omac/omac_memory.o src/mac/omac/omac_memory_multi.o \
86+
src/mac/omac/omac_process.o src/mac/omac/omac_test.o src/mac/pelican/pelican.o \
87+
src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o src/mac/pmac/pmac_done.o \
88+
src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
8789
src/mac/pmac/pmac_memory_multi.o src/mac/pmac/pmac_ntz.o src/mac/pmac/pmac_process.o \
8890
src/mac/pmac/pmac_shift_xor.o src/mac/pmac/pmac_test.o src/mac/poly1305/poly1305.o \
8991
src/mac/poly1305/poly1305_file.o src/mac/poly1305/poly1305_memory.o \

makefile.msvc

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,23 @@ src/hashes/blake2b.obj src/hashes/blake2s.obj src/hashes/chc/chc.obj src/hashes/
6262
src/hashes/helper/hash_filehandle.obj src/hashes/helper/hash_memory.obj \
6363
src/hashes/helper/hash_memory_multi.obj src/hashes/md2.obj src/hashes/md4.obj src/hashes/md5.obj \
6464
src/hashes/rmd128.obj src/hashes/rmd160.obj src/hashes/rmd256.obj src/hashes/rmd320.obj src/hashes/sha1.obj \
65-
src/hashes/sha1_desc.obj src/hashes/sha1_x86.obj src/hashes/sha2/sha224.obj src/hashes/sha2/sha256.obj \
66-
src/hashes/sha2/sha384.obj src/hashes/sha2/sha512.obj src/hashes/sha2/sha512_224.obj \
67-
src/hashes/sha2/sha512_256.obj src/hashes/sha3.obj src/hashes/sha3_test.obj src/hashes/tiger.obj \
68-
src/hashes/whirl/whirl.obj src/mac/blake2/blake2bmac.obj src/mac/blake2/blake2bmac_file.obj \
69-
src/mac/blake2/blake2bmac_memory.obj src/mac/blake2/blake2bmac_memory_multi.obj \
70-
src/mac/blake2/blake2bmac_test.obj src/mac/blake2/blake2smac.obj src/mac/blake2/blake2smac_file.obj \
71-
src/mac/blake2/blake2smac_memory.obj src/mac/blake2/blake2smac_memory_multi.obj \
72-
src/mac/blake2/blake2smac_test.obj src/mac/f9/f9_done.obj src/mac/f9/f9_file.obj src/mac/f9/f9_init.obj \
73-
src/mac/f9/f9_memory.obj src/mac/f9/f9_memory_multi.obj src/mac/f9/f9_process.obj src/mac/f9/f9_test.obj \
74-
src/mac/hmac/hmac_done.obj src/mac/hmac/hmac_file.obj src/mac/hmac/hmac_init.obj src/mac/hmac/hmac_memory.obj \
75-
src/mac/hmac/hmac_memory_multi.obj src/mac/hmac/hmac_process.obj src/mac/hmac/hmac_test.obj \
76-
src/mac/omac/omac_done.obj src/mac/omac/omac_file.obj src/mac/omac/omac_init.obj src/mac/omac/omac_memory.obj \
77-
src/mac/omac/omac_memory_multi.obj src/mac/omac/omac_process.obj src/mac/omac/omac_test.obj \
78-
src/mac/pelican/pelican.obj src/mac/pelican/pelican_memory.obj src/mac/pelican/pelican_test.obj \
79-
src/mac/pmac/pmac_done.obj src/mac/pmac/pmac_file.obj src/mac/pmac/pmac_init.obj src/mac/pmac/pmac_memory.obj \
65+
src/hashes/sha1_desc.obj src/hashes/sha1_x86.obj src/hashes/sha2/sha224.obj src/hashes/sha2/sha224_desc.obj \
66+
src/hashes/sha2/sha224_x86.obj src/hashes/sha2/sha256.obj src/hashes/sha2/sha256_desc.obj \
67+
src/hashes/sha2/sha256_x86.obj src/hashes/sha2/sha384.obj src/hashes/sha2/sha512.obj \
68+
src/hashes/sha2/sha512_224.obj src/hashes/sha2/sha512_256.obj src/hashes/sha3.obj src/hashes/sha3_test.obj \
69+
src/hashes/tiger.obj src/hashes/whirl/whirl.obj src/mac/blake2/blake2bmac.obj \
70+
src/mac/blake2/blake2bmac_file.obj src/mac/blake2/blake2bmac_memory.obj \
71+
src/mac/blake2/blake2bmac_memory_multi.obj src/mac/blake2/blake2bmac_test.obj src/mac/blake2/blake2smac.obj \
72+
src/mac/blake2/blake2smac_file.obj src/mac/blake2/blake2smac_memory.obj \
73+
src/mac/blake2/blake2smac_memory_multi.obj src/mac/blake2/blake2smac_test.obj src/mac/f9/f9_done.obj \
74+
src/mac/f9/f9_file.obj src/mac/f9/f9_init.obj src/mac/f9/f9_memory.obj src/mac/f9/f9_memory_multi.obj \
75+
src/mac/f9/f9_process.obj src/mac/f9/f9_test.obj src/mac/hmac/hmac_done.obj src/mac/hmac/hmac_file.obj \
76+
src/mac/hmac/hmac_init.obj src/mac/hmac/hmac_memory.obj src/mac/hmac/hmac_memory_multi.obj \
77+
src/mac/hmac/hmac_process.obj src/mac/hmac/hmac_test.obj src/mac/omac/omac_done.obj src/mac/omac/omac_file.obj \
78+
src/mac/omac/omac_init.obj src/mac/omac/omac_memory.obj src/mac/omac/omac_memory_multi.obj \
79+
src/mac/omac/omac_process.obj src/mac/omac/omac_test.obj src/mac/pelican/pelican.obj \
80+
src/mac/pelican/pelican_memory.obj src/mac/pelican/pelican_test.obj src/mac/pmac/pmac_done.obj \
81+
src/mac/pmac/pmac_file.obj src/mac/pmac/pmac_init.obj src/mac/pmac/pmac_memory.obj \
8082
src/mac/pmac/pmac_memory_multi.obj src/mac/pmac/pmac_ntz.obj src/mac/pmac/pmac_process.obj \
8183
src/mac/pmac/pmac_shift_xor.obj src/mac/pmac/pmac_test.obj src/mac/poly1305/poly1305.obj \
8284
src/mac/poly1305/poly1305_file.obj src/mac/poly1305/poly1305_memory.obj \

makefile.unix

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,21 +83,23 @@ src/hashes/blake2b.o src/hashes/blake2s.o src/hashes/chc/chc.o src/hashes/helper
8383
src/hashes/helper/hash_filehandle.o src/hashes/helper/hash_memory.o \
8484
src/hashes/helper/hash_memory_multi.o src/hashes/md2.o src/hashes/md4.o src/hashes/md5.o \
8585
src/hashes/rmd128.o src/hashes/rmd160.o src/hashes/rmd256.o src/hashes/rmd320.o src/hashes/sha1.o \
86-
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha256.o \
87-
src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o src/hashes/sha2/sha512_224.o \
88-
src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o src/hashes/tiger.o \
89-
src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o src/mac/blake2/blake2bmac_file.o \
90-
src/mac/blake2/blake2bmac_memory.o src/mac/blake2/blake2bmac_memory_multi.o \
91-
src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o src/mac/blake2/blake2smac_file.o \
92-
src/mac/blake2/blake2smac_memory.o src/mac/blake2/blake2smac_memory_multi.o \
93-
src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o src/mac/f9/f9_file.o src/mac/f9/f9_init.o \
94-
src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o src/mac/f9/f9_process.o src/mac/f9/f9_test.o \
95-
src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o \
96-
src/mac/hmac/hmac_memory_multi.o src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o \
97-
src/mac/omac/omac_done.o src/mac/omac/omac_file.o src/mac/omac/omac_init.o src/mac/omac/omac_memory.o \
98-
src/mac/omac/omac_memory_multi.o src/mac/omac/omac_process.o src/mac/omac/omac_test.o \
99-
src/mac/pelican/pelican.o src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o \
100-
src/mac/pmac/pmac_done.o src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
86+
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha224_desc.o \
87+
src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
88+
src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
89+
src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
90+
src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
91+
src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
92+
src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
93+
src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \
94+
src/mac/blake2/blake2smac_memory_multi.o src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o \
95+
src/mac/f9/f9_file.o src/mac/f9/f9_init.o src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o \
96+
src/mac/f9/f9_process.o src/mac/f9/f9_test.o src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o \
97+
src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o src/mac/hmac/hmac_memory_multi.o \
98+
src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o src/mac/omac/omac_done.o src/mac/omac/omac_file.o \
99+
src/mac/omac/omac_init.o src/mac/omac/omac_memory.o src/mac/omac/omac_memory_multi.o \
100+
src/mac/omac/omac_process.o src/mac/omac/omac_test.o src/mac/pelican/pelican.o \
101+
src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o src/mac/pmac/pmac_done.o \
102+
src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
101103
src/mac/pmac/pmac_memory_multi.o src/mac/pmac/pmac_ntz.o src/mac/pmac/pmac_process.o \
102104
src/mac/pmac/pmac_shift_xor.o src/mac/pmac/pmac_test.o src/mac/poly1305/poly1305.o \
103105
src/mac/poly1305/poly1305_file.o src/mac/poly1305/poly1305_memory.o \

makefile_include.mk

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -254,21 +254,23 @@ src/hashes/blake2b.o src/hashes/blake2s.o src/hashes/chc/chc.o src/hashes/helper
254254
src/hashes/helper/hash_filehandle.o src/hashes/helper/hash_memory.o \
255255
src/hashes/helper/hash_memory_multi.o src/hashes/md2.o src/hashes/md4.o src/hashes/md5.o \
256256
src/hashes/rmd128.o src/hashes/rmd160.o src/hashes/rmd256.o src/hashes/rmd320.o src/hashes/sha1.o \
257-
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha256.o \
258-
src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o src/hashes/sha2/sha512_224.o \
259-
src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o src/hashes/tiger.o \
260-
src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o src/mac/blake2/blake2bmac_file.o \
261-
src/mac/blake2/blake2bmac_memory.o src/mac/blake2/blake2bmac_memory_multi.o \
262-
src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o src/mac/blake2/blake2smac_file.o \
263-
src/mac/blake2/blake2smac_memory.o src/mac/blake2/blake2smac_memory_multi.o \
264-
src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o src/mac/f9/f9_file.o src/mac/f9/f9_init.o \
265-
src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o src/mac/f9/f9_process.o src/mac/f9/f9_test.o \
266-
src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o \
267-
src/mac/hmac/hmac_memory_multi.o src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o \
268-
src/mac/omac/omac_done.o src/mac/omac/omac_file.o src/mac/omac/omac_init.o src/mac/omac/omac_memory.o \
269-
src/mac/omac/omac_memory_multi.o src/mac/omac/omac_process.o src/mac/omac/omac_test.o \
270-
src/mac/pelican/pelican.o src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o \
271-
src/mac/pmac/pmac_done.o src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
257+
src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes/sha2/sha224_desc.o \
258+
src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
259+
src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
260+
src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
261+
src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
262+
src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
263+
src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
264+
src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \
265+
src/mac/blake2/blake2smac_memory_multi.o src/mac/blake2/blake2smac_test.o src/mac/f9/f9_done.o \
266+
src/mac/f9/f9_file.o src/mac/f9/f9_init.o src/mac/f9/f9_memory.o src/mac/f9/f9_memory_multi.o \
267+
src/mac/f9/f9_process.o src/mac/f9/f9_test.o src/mac/hmac/hmac_done.o src/mac/hmac/hmac_file.o \
268+
src/mac/hmac/hmac_init.o src/mac/hmac/hmac_memory.o src/mac/hmac/hmac_memory_multi.o \
269+
src/mac/hmac/hmac_process.o src/mac/hmac/hmac_test.o src/mac/omac/omac_done.o src/mac/omac/omac_file.o \
270+
src/mac/omac/omac_init.o src/mac/omac/omac_memory.o src/mac/omac/omac_memory_multi.o \
271+
src/mac/omac/omac_process.o src/mac/omac/omac_test.o src/mac/pelican/pelican.o \
272+
src/mac/pelican/pelican_memory.o src/mac/pelican/pelican_test.o src/mac/pmac/pmac_done.o \
273+
src/mac/pmac/pmac_file.o src/mac/pmac/pmac_init.o src/mac/pmac/pmac_memory.o \
272274
src/mac/pmac/pmac_memory_multi.o src/mac/pmac/pmac_ntz.o src/mac/pmac/pmac_process.o \
273275
src/mac/pmac/pmac_shift_xor.o src/mac/pmac/pmac_test.o src/mac/poly1305/poly1305.o \
274276
src/mac/poly1305/poly1305_file.o src/mac/poly1305/poly1305_memory.o \

sources.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,11 @@ src/hashes/sha1.c
104104
src/hashes/sha1_desc.c
105105
src/hashes/sha1_x86.c
106106
src/hashes/sha2/sha224.c
107+
src/hashes/sha2/sha224_desc.c
108+
src/hashes/sha2/sha224_x86.c
107109
src/hashes/sha2/sha256.c
110+
src/hashes/sha2/sha256_desc.c
111+
src/hashes/sha2/sha256_x86.c
108112
src/hashes/sha2/sha384.c
109113
src/hashes/sha2/sha512.c
110114
src/hashes/sha2/sha512_224.c

src/hashes/sha2/sha224.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
#if defined(LTC_SHA224) && defined(LTC_SHA256)
1111

12-
const struct ltc_hash_descriptor sha224_desc =
12+
const struct ltc_hash_descriptor sha224_c_desc =
1313
{
1414
"sha224",
1515
10,
@@ -20,9 +20,9 @@ const struct ltc_hash_descriptor sha224_desc =
2020
{ 2, 16, 840, 1, 101, 3, 4, 2, 4, },
2121
9,
2222

23-
&sha224_init,
23+
&sha224_c_init,
2424
&sha256_process,
25-
&sha224_done,
25+
&sha224_c_done,
2626
&sha224_test,
2727
NULL
2828
};
@@ -33,20 +33,20 @@ const struct ltc_hash_descriptor sha224_desc =
3333
@param md The hash state you wish to initialize
3434
@return CRYPT_OK if successful
3535
*/
36-
int sha224_init(hash_state * md)
36+
int sha224_c_init(hash_state * md)
3737
{
3838
LTC_ARGCHK(md != NULL);
3939

40-
md->sha256.curlen = 0;
41-
md->sha256.length = 0;
42-
md->sha256.state[0] = 0xc1059ed8UL;
43-
md->sha256.state[1] = 0x367cd507UL;
44-
md->sha256.state[2] = 0x3070dd17UL;
45-
md->sha256.state[3] = 0xf70e5939UL;
46-
md->sha256.state[4] = 0xffc00b31UL;
47-
md->sha256.state[5] = 0x68581511UL;
48-
md->sha256.state[6] = 0x64f98fa7UL;
49-
md->sha256.state[7] = 0xbefa4fa4UL;
40+
md->sha256_c.curlen = 0;
41+
md->sha256_c.length = 0;
42+
md->sha256_c.state[0] = 0xc1059ed8UL;
43+
md->sha256_c.state[1] = 0x367cd507UL;
44+
md->sha256_c.state[2] = 0x3070dd17UL;
45+
md->sha256_c.state[3] = 0xf70e5939UL;
46+
md->sha256_c.state[4] = 0xffc00b31UL;
47+
md->sha256_c.state[5] = 0x68581511UL;
48+
md->sha256_c.state[6] = 0x64f98fa7UL;
49+
md->sha256_c.state[7] = 0xbefa4fa4UL;
5050
return CRYPT_OK;
5151
}
5252

@@ -56,7 +56,7 @@ int sha224_init(hash_state * md)
5656
@param out [out] The destination of the hash (28 bytes)
5757
@return CRYPT_OK if successful
5858
*/
59-
int sha224_done(hash_state * md, unsigned char *out)
59+
int sha224_c_done(hash_state * md, unsigned char *out)
6060
{
6161
unsigned char buf[32];
6262
int err;
@@ -76,7 +76,7 @@ int sha224_done(hash_state * md, unsigned char *out)
7676
Self-test the hash
7777
@return CRYPT_OK if successful, CRYPT_NOP if self-tests have been disabled
7878
*/
79-
int sha224_test(void)
79+
int sha224_c_test(void)
8080
{
8181
#ifndef LTC_TEST
8282
return CRYPT_NOP;
@@ -104,9 +104,9 @@ int sha224_test(void)
104104
hash_state md;
105105

106106
for (i = 0; i < (int)(sizeof(tests) / sizeof(tests[0])); i++) {
107-
sha224_init(&md);
108-
sha224_process(&md, (unsigned char*)tests[i].msg, (unsigned long)XSTRLEN(tests[i].msg));
109-
sha224_done(&md, tmp);
107+
sha224_c_init(&md);
108+
sha224_c_process(&md, (unsigned char*)tests[i].msg, (unsigned long)XSTRLEN(tests[i].msg));
109+
sha224_c_done(&md, tmp);
110110
if (ltc_compare_testvector(tmp, sizeof(tmp), tests[i].hash, sizeof(tests[i].hash), "SHA224", i)) {
111111
return CRYPT_FAIL_TESTVECTOR;
112112
}

0 commit comments

Comments
 (0)