Merge pull request #732 from libtom/pr/sm3-hash

SM3 hash function

Author: sjaeckel

doc/crypt.tex

@@ -3057,6 +3057,7 @@ \subsection{Hash Registration}
       \hline RIPEMD-256 & rmd160\_desc & 32 & 13 \\
       \hline BLAKE2S-256 & blake2s\_256\_desc & 32 & 24 \\
       \hline BLAKE2B-256 & blake2b\_256\_desc & 32 & 26 \\
+      \hline SM3 & sm3\_desc & 32 & 34 \\
       \hline SHA-512/224 & sha512\_224\_desc & 28 & 15 \\
       \hline Keccak224 & keccak\_224\_desc & 28 & 29 \\
       \hline SHA3-224 & sha3\_224\_desc & 28 & 17 \\
@@ -3298,7 +3299,7 @@ \subsection{KangarooTwelve}
 These hashes are provided for completeness and they still can be used for the purposes of password hashing or one-way accumulators
 (e.g. Yarrow).
 
-The other hashes such as the SHA-2 (that includes SHA-512, SHA-512/384, SHA-384, SHA-512/256, SHA-256 and SHA-224), TIGER-192 and TIGER2-192 are still
+The other hashes such as the SHA-2 (that includes SHA-512, SHA-512/384, SHA-384, SHA-512/256, SHA-256 and SHA-224), SM3, TIGER-192 and TIGER2-192 are still
 considered secure for all purposes you would normally use a hash for.
 
 \chapter{Checksum Functions}

libtomcrypt_VS2008.vcproj

@@ -871,6 +871,10 @@
 				RelativePath="src\hashes\sha3_test.c"
 				>
 			</File>
+			<File
+				RelativePath="src\hashes\sm3.c"
+				>
+			</File>
 			<File
 				RelativePath="src\hashes\tiger.c"
 				>

makefile.mingw

@@ -70,7 +70,7 @@ src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes
 src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
 src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
 src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
-src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
+src/hashes/sm3.o src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
 src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
 src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
 src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \

makefile.msvc

@@ -63,7 +63,7 @@ src/hashes/sha1_desc.obj src/hashes/sha1_x86.obj src/hashes/sha2/sha224.obj src/
 src/hashes/sha2/sha224_x86.obj src/hashes/sha2/sha256.obj src/hashes/sha2/sha256_desc.obj \
 src/hashes/sha2/sha256_x86.obj src/hashes/sha2/sha384.obj src/hashes/sha2/sha512.obj \
 src/hashes/sha2/sha512_224.obj src/hashes/sha2/sha512_256.obj src/hashes/sha3.obj src/hashes/sha3_test.obj \
-src/hashes/tiger.obj src/hashes/whirl/whirl.obj src/mac/blake2/blake2bmac.obj \
+src/hashes/sm3.obj src/hashes/tiger.obj src/hashes/whirl/whirl.obj src/mac/blake2/blake2bmac.obj \
 src/mac/blake2/blake2bmac_file.obj src/mac/blake2/blake2bmac_memory.obj \
 src/mac/blake2/blake2bmac_memory_multi.obj src/mac/blake2/blake2bmac_test.obj src/mac/blake2/blake2smac.obj \
 src/mac/blake2/blake2smac_file.obj src/mac/blake2/blake2smac_memory.obj \

makefile.unix

@@ -84,7 +84,7 @@ src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes
 src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
 src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
 src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
-src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
+src/hashes/sm3.o src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
 src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
 src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
 src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \

makefile_include.mk

@@ -255,7 +255,7 @@ src/hashes/sha1_desc.o src/hashes/sha1_x86.o src/hashes/sha2/sha224.o src/hashes
 src/hashes/sha2/sha224_x86.o src/hashes/sha2/sha256.o src/hashes/sha2/sha256_desc.o \
 src/hashes/sha2/sha256_x86.o src/hashes/sha2/sha384.o src/hashes/sha2/sha512.o \
 src/hashes/sha2/sha512_224.o src/hashes/sha2/sha512_256.o src/hashes/sha3.o src/hashes/sha3_test.o \
-src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
+src/hashes/sm3.o src/hashes/tiger.o src/hashes/whirl/whirl.o src/mac/blake2/blake2bmac.o \
 src/mac/blake2/blake2bmac_file.o src/mac/blake2/blake2bmac_memory.o \
 src/mac/blake2/blake2bmac_memory_multi.o src/mac/blake2/blake2bmac_test.o src/mac/blake2/blake2smac.o \
 src/mac/blake2/blake2smac_file.o src/mac/blake2/blake2smac_memory.o \

notes/hash_tv.txt

@@ -6667,6 +6667,137 @@ Hash: md4
 127: 2067886DA4BDE10A94B971CD740B0AAB
 128: E1275970EB67D2D996E6E658270AA149
 
+Hash: sm3
+  0: 1AB21D8355CFA17F8E61194831E81A8F22BEC8C728FEFB747ED035EB5082AA2B
+  1: 2DAEF60E7A0B8F5E024C81CD2AB3109F2B4F155CF83ADEB2AE5532F74A157FDF
+  2: D8AABBEF65E6196AE1106FDDF48CDD0FD6EEE7FF54CD678F209B4914426B0221
+  3: D18C17EF9F985BA361F06B599A1EC3CAE9BD5DE6967CAC33944E5F8B67B6DCC2
+  4: 4B41BC3558731767A4B19187A64F8D171878EF5A45BFD73670815C2C66387D75
+  5: 96EDA336EB22EE830F1D1354CE363872497171A3EAC3CDF1D251C88BD4D28D2F
+  6: 728ED1FF1C9FF55249889985CB21187D6E4F9516CC5CDBA5F7CCE79F5FF12DF9
+  7: F4AFC6E2843C2B00DE925B36259E386659BB727CFC528016F434E2D79AE46E7B
+  8: 6C79B88EE30D03CB22B842BFCC15A18F839F70EAADBD3BDA953C6AA31092F83B
+  9: D9260EB16F78E835EAD5B02FCA32321439FAFFC1763507DF21B3848EEAD70E73
+ 10: 24C898BDB4D258F9BEBB2E820D4ED478A7C013B37BD9E5006515730C18A70416
+ 11: 25982ABCAF86A30979CFBD4F86C76F2A3160F916CA0301A55C1B48DB89C8D7C5
+ 12: B1A7B180FFD9147FA043ACFE6C794E902656C502B4F241B01F9DE1229562205B
+ 13: 65721525FCA963BFB01D5250A032AD3FC15F5D3B1E591906E892F8ABD4499A5E
+ 14: 386D2B4DCB208DB57B938C345338BDBEC61547EED302ECD273992A64876155D7
+ 15: C706E492B6994B610A4B62ABA68E797772AB5DC2764EC35980DBA24734CA2EB1
+ 16: F65C16E869F79670DEE45F4B56FE2B3E0308D8FEFC3214E16C64B7F5D3741E89
+ 17: 431F00611D6EDCBAEB4C53C8F94148478A894E34383984F6D3BC45D144EF1B1C
+ 18: FE4C9FF5DEF43DD8A6E1EED798AE1515871BAF70FDE50A7F9AA3391C53604FF3
+ 19: 674ED992C21A2842673AF768EB51374790252097CA545F426AF6F898865BA903
+ 20: 54001A49B4CD4275A032A257405FF7CB0CB8B396DD9D8D4D387F4A5840EE0C13
+ 21: 6C9206FB7D349AC74D44352A4F5203F800AF34C1AEA8F1CF8C6AC491317DD1B5
+ 22: 6A4C8E752F5D4B4774FC5CE600260B727DEF2850A2D4BC470E63E6E728DE9D7B
+ 23: A4F9221FF5E44E68CFA1576CF37A57BC7EAA1FC365BEAC7D369C414770DC3FBE
+ 24: D5CD0C791215BB022B7A07FE60A947AB436A4EC1CBC29CA60824A57CC6074CE1
+ 25: 52BE7FD40C801C55380473D80AE191B273BB90F4750180F12C84B92F0378E102
+ 26: 1B3F4246B2AD89AF381FAD9D993BAB24CCAC205576594D292489836F45E7038D
+ 27: 41903C7B3EA1F3F63FE734F54998682C97723336AF661DC988919FF7C0D8ECF0
+ 28: B268AF3A3971754C8DF859C6A91BFDE7929CAE0C4F4CB08826990F02574D7E95
+ 29: 137E134DCAF4348C629347DB5626DC85FEC2A9312B6B379CD2ACEF43D073983B
+ 30: 65333197B21CDE07F4A452656CE2EF447CAC4EB56AE0F25FA9AB1551A52A2E58
+ 31: 182C11FF061A611473BB2357FB422EDEC582C80837CB0A838B43761E81E528CF
+ 32: FA34635F1D3AC2729AC5987EB59E01928457F325B4B51CA85A177813C5C5DDF7
+ 33: D2D8FE4545DA9CD3AFD31D31425FA2B3CDE043C6B40DB542B81683C20303CD21
+ 34: 09276AF3F77A8F06F9A3F84DD05DEFE5704F4B4A51FA27CB9EC162085037AE33
+ 35: 36D1655C6F37FF56626234E8934B8922A66B978C78ADCAD8234D6A66C201F29D
+ 36: 3CE6E59BCB3B3EE8581E34EA5A92CD5C5D03C877A54ED9C8CEFF188125FC765D
+ 37: 2FF022CEC2F8D6C474C86237E747983D0833EB65A435925FCE17E780E4D83404
+ 38: CF021C2A028F8101AB8173E35DEE507F5BE2FB2F133BEBF4AC6F1A3C420986F9
+ 39: 51C501B8F6F85B3C36B630171F857E58622DAD1CAFE296D2371187F24D307A7E
+ 40: 9D96C19358BBC611B74B1844A69E12931884879CC2267245FE940B11662F905E
+ 41: 42248EEAA80C20C2181D982E2C612C422A483866BE662766B754D4090D19BBAD
+ 42: C1EFBEDE74C4FF558DD39C550AD0C078CD42D10B5183CA4CF626B1C8A7504802
+ 43: 5474CD859A1CE6B80B04F40ADE7E010BD26AEED4BE01978DCED46445FEE8F93D
+ 44: 7E20B15A795D8278C911C8E8FEFC2A4DCF57BDE011DD9AD9F32A0FE758A829F3
+ 45: E36DCBAC4C65F93D23F83FFA5F9FA8F6F542F96DC957A2952FF50C1836C7E1D7
+ 46: 791E088D7D0A769E47CA3CFBC99723C549078E389D687D0E9A4F13EC6BA5457C
+ 47: E14485A2627415801FEDBCC1C34A6C3312940126EF62A90D94BBBE5E694CA89D
+ 48: 7EC11F122FA8D8858B6D4296B25E941D2C2FBD1E583D47B7EA24CFC9E4035A9A
+ 49: 8E13771E93C4181F1970BD92B9F8E349EB9C69F780D8E1BB0409B092F0122937
+ 50: F24CEF726525070D3B44EA309A6A03396B22F6C48F0DDDD99539AC4DC62CE4EC
+ 51: 9731C326383BDD50E2AC8BE14E8B04418CECB904502F888658EC3AB27C44D926
+ 52: 4BFEF43CD2AA9BD40275DE4DD7E6E41CFC9090D2C5EBE1C96D00F336E287A925
+ 53: 2A5FD61773794FD7C959FFB29256C1C9A9C028CA1E4F1F2F5224C002B766989A
+ 54: 1BB1B592239447B5DE0395D94159996EA7CC4FCC7B9F66CCC5F0CFDC89586782
+ 55: A79CF9DCEE3404ABF7F769698201647FD9D3FF61D629D0F58BB4B5579A427DB8
+ 56: 62F7363B15F4DE76DD925C493B9D6D00D4BA0EF2A1F334C1D0F13B293AEB40D1
+ 57: 441F67CC31781DD2986FC612B92DFADE871D81357F2487F5C86D94A8C6778D82
+ 58: B4242D2BDE6758049D6BF3AC979CFBFA8590C8F9A964BAA53F4DE3529E958CE8
+ 59: FE83EBD916FA2EFE514556D3F3410D5C571D26B97722517D182626D1E8D67D65
+ 60: F886E1C50D032C1B893A53200F5D2C0DBC9B486CB0EEA56FBBB63A35BEAD01B0
+ 61: CF232D81E9C18D7CABD90EEBD871C81A69BDF378AC06E49C2E8EFF969B75B670
+ 62: 84932BAEBBA0FF9E1506788E6CFEFE7E6FA6B2E7132242B91417E1C5DB4F7706
+ 63: 6165E4CBB15CDE01C6226E0015A47F710F8F8E1F2C296700033BB34D9212109C
+ 64: 93566F236D157AAE078D1DDB5CEBDBBA1520B5142E22A8915564345BA2AE1D63
+ 65: C886E6814BE748285A10B28AE62DDACD85DB830CD2CF3A2BFA2F729C15F63618
+ 66: E844F6E566C8E40CA5E650B938C4EA3C1EBB3F16A714F51F3303A089C09F9E62
+ 67: CFD56A9CD3AB872B2E3893011341330B921513790C938BF09603F6DA2EC0520C
+ 68: 879E8707EB2F72C8FAE188F026486B3F0864B5EC43B7968FC516D3DB91AD72E5
+ 69: DA5887C018000EDCF53D3E1E0B300FDB6619130A9D99EB5B80170D3308BF1036
+ 70: 5EA935C5BC7A7D1F0A05865D059F9DE99D9C21CACAEE6335D896C386F2380F1A
+ 71: C4424CF106704451159FBF8AB1B69C0DCA84FBFF9D186702FDA7A99D1FD2DC77
+ 72: C10B8C332565AB5A91C09BBB6E6E0187824CC5AEE0A2F9C607DA3B6DE15F9456
+ 73: 807624E5CB1BC14F514C9F7C4FF1235D02B4FB9C8CEECE3458B20DACADD9BE0E
+ 74: C2B0AEEB41EEDFB383D1137F6C84D0331254ECAA1E1108E7D6C3F19BC28AA90C
+ 75: B5C1A6629434D8E47F192C10B79562D390CB91754755AFFF4DD6824AA9ECDA63
+ 76: C6D12158451A0C2B14DDF34D2A512065F338D8B57EA821591B67C6A7D1F9BC5E
+ 77: 0311B0CE52BC5DBE8C837EA76D6D6259C2F4FCDC6C7BD2E16D78B67AB4149B8F
+ 78: 470739A11C5C5EB5860A0450AEB696AFC7EBF24DD95DC555E99B279FDD88B06F
+ 79: 7F57AD909EF4F62D7E762BBE1C9C3F18C4CCAF37805995CE86FABB7C762D1FF6
+ 80: 9A1198BAD957F2E411297E1D17B627AFB6C842437C0ADE5879EA249021D1F0CD
+ 81: 7FC44253FA19DDE0A9FE8B116A0D01BF95A3077440C1A5D11B9614B6429DF505
+ 82: F056FFB3833ACD0379144757E9816953AB097191533DC8A57AFFD1D127B38C4A
+ 83: CCD3FA40CC2D2114A5E9B3325F6584A4DF488E1B34BA3E2D1528327A36F352A9
+ 84: 04203C3B8F1FFD61FF3D0134C6172D39C97B94B962B2ED7BE70070F0996DA57A
+ 85: 157CA56DB5039FB8BF536DADEA456EED976AE7DB54372EF71750852A1BF0542C
+ 86: 910BA7725F46EE646C270C7E82C5CFD2C9066FC0D88FB2820BA963C26DF1F465
+ 87: 867441F91E3CA3E5EA5DB6269B8E30BAF5F6FD2BD56FB3FB715D4A8C7810CC71
+ 88: 6701746ADDF00166C676CBA3F6CEC7BE379119C00F11011537ACD99BDB3CE0C7
+ 89: 6D6E112EEC5B237AF3927A9A2ABFE7E4669FC15C5AD379D072D32B1D255BDCFB
+ 90: 986F414001210C8F32AA79DBE9EF3D7375E75C51271B7A04B366C67AAE1E4C87
+ 91: 4AE6B2E1F2461A55CF44D92390BAA0492333A9F25645CBE1352CFBC5B42AFA2B
+ 92: 6A529A8E765E6988300F495E9B73A651C28E39892F0B31B4D5C43FAEB06F3870
+ 93: 2228C5374B0B93CBBA4D4012362C6207AD2FF0CFA0DA0C5FE5622772B1885976
+ 94: 2DAD3FA1D4856E95B67B261A5EBF6C5AFF149C5A7BCA25130940CA9E70CB6251
+ 95: 6529643CE86E9FAF589409403F6DE23908FB91499C8AD09805AAD6C7F3EC5751
+ 96: 2EDBD8866011F112124F30774E9CE85E3BEA3C2CCF98FD8757046A2943DA59B6
+ 97: 2B987812D4479D2F095A5A22AAE0B8A77A1BDECDEBDA16DCB987CF3974003E81
+ 98: 95BE171D4DC68DC32DA1DD5A1A31808C0A324A8FEAA4044F0CBE7304F4B3603E
+ 99: 7D4EAC94A68E328B800BE8D9BB1772C268450B7A3C9959D0729F036CDB8B8BB6
+100: 4B2833C158DD41614B76E37F18889243BD6B4A744E36DE60920A2F89E409C64E
+101: B0992CB78BE5CDA48BF503DE1D3B4EF88AEFFF54EE6CF8A2BE14CA48BC400D55
+102: 0CD08EAA77E6A6F48E1E4A9371C17EC66B5D3B27A28A00E93D633CB68097CC4E
+103: 30821BF5C6770CB2071A04BC764FFC859EE9FD51149A0FBF6F45FCACE6523D44
+104: 67916A4F629B6CCC733EDDE300D316EB405BC04E7D381738456E2AF39601DC70
+105: AAC90FA00921904EF66D6BDF92DC29F478E1D394CC4E8ECC68F71882062380FA
+106: DBF54DC0B588C2DE7DD9FF941868873D60222E77990C16CA2892B32B326EFFC6
+107: FE698FFCFAA632E75EA1B943889ED4D090E91E846AFC78053C8B72D8019C56F8
+108: 3FAACA4E09E7667DEAAB83ECB6D430E9DF80C0D1F69B05981DA052D6A0BCD977
+109: 32302DB834A491D160AAF5C0A66AD90CFAFEEA5855E6D0283BA331B66777DA46
+110: F3214C9CCA8FA3682D22660A541625D55F2B3B7D7B56362A861D4A1C75056E36
+111: 46EA8FF040518238FB6E34B688209BDCD18B31672C4BA28271045F8C8C312733
+112: 1C7B0125F4F56AA3E7104B10B25CE1C98E7668720F9A9E2EB21B6DE36BBC62E7
+113: 2C828958C3F34A2587DF239F258F52B3ECB599F67E96A4064DA2D4FA1A955F2C
+114: CFDD1BEF2646546BC6FEE51B84AE9A056A1F3D3FF404F719C5EA889AAD00594A
+115: A02A9AFC0B47E0F4E79924CD3FD2A9E242664360172B61298486D0CC6A9583CA
+116: 7708158049314AFDEB7C9B23B18E27F556D480057AAE126114167688B2D5EE0F
+117: 8990E02F7553F6077D6DA698CA76688E64F52FFC93A975085D2FD36D9541A2F9
+118: 28470FFDEC4F1C82E0A09F1D2A771DFB0D785F7119E401B6E5A42029DFC88C32
+119: 8F3EA392A89A7119982D6634660DB1A95F35D68267A2235E3255998A857F4FBF
+120: 6BABEE35E6A1515AF9D6255109C24F3C08897829422C6225D235FD4C8527E9EC
+121: 501BF851D9377E2F02E6DC2DA58795B5A7337D94EFBEA64BCBAF0B3DF11E240C
+122: 00825B1AB35F89279C4869826C159F5910CFFDE3AE20AAB7BCA13EC8263E12E5
+123: 722D468220D61A129D766E589968B196E4136B39C4E83B5CA215050C4CC7107A
+124: 76ABE4F014C7CAF037FC6B87529F8031DBA51F55BA3C00C61C8AAAD666C43098
+125: 60434971512E75B7325472797C7B11BC4932EC6561050EBF8A38698BDDC84B76
+126: 07F7BA45D5551D5DBD3C3926619235A7EE880396D67A63398053DA8E3376BCDB
+127: BCA3436D828517A6A6893A9E309E06E7B7B29C6E3F78B4814B23EFE149962980
+128: A9E7985473CA09DF1510D83B572F72375430756C4A661B00724AFEB8B75DD0A5
+
 Hash: chc_hash
   0: 4047929F1F572643B55F829EB3291D11
   1: 8898FD04F810507740E7A8DBF44C18E8

notes/hashsum_tv.txt

@@ -31,6 +31,7 @@ sha512-224: 64ec566b5c2de736eab1b4e8542dc110f736819ea7f8f48e3712fbad *tests/test
 sha512-256: db880bce4beb7246510febb961c7595aab57a15de6f90cd079f145e476b5d773 *tests/test.key
 shake128: 9acc6823e58083f1499718d478ea42f75656b4780800c3b105678c4985cdf3a9 *tests/test.key
 shake256: 29d0d19db50cb5b90a7ce94883a04bb6a97b0dbb9a648f342d7032d64160dc7019262ed0e055ee209c5a0daa92f36004c9c51d70402145908b4b6e91ea15b5a1 *tests/test.key
+sm3: e03629750a6e6be2b1be1dde48b83be44a7ff19f1cbe3d9bcab540aa2b7e4d6c *tests/test.key
 tiger: 97d713850e7affac30a642572c1ee7b18793d5b9e0ef5932 *tests/test.key
 tiger2: b2dfd53b3edba5b54e1f21a82cbf6a3475efbce33a8cae03 *tests/test.key
 whirlpool: d7d41c755e0f28313f254cb198e0bfa42f56670595d97b80dceec754825d69938a9c11e5bf16e9a3809a62a09bddf021f3dbff4302ceec7ba46c88b41772b711 *tests/test.key