From 311647cb8e970b0593196b24a4ef62795aeb1be3 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 12 Feb 2019 19:45:54 -0500 Subject: [PATCH] Use SHAKE-128 and SHAKE-256 names --- TestVectors/shake.txt | 5 +++-- shake.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/TestVectors/shake.txt b/TestVectors/shake.txt index 64dd9412..bbb12e69 100644 --- a/TestVectors/shake.txt +++ b/TestVectors/shake.txt @@ -1,5 +1,5 @@ AlgorithmType: MessageDigest -Name: SHAKE128 +Name: SHAKE-128 Source: Botan 2.10 library # Message: @@ -601,7 +601,8 @@ Test: Verify Message: B64FF54AEED71D6737555D786D3A72B7F01D79FF51BB0056EC3D9C6CDA06D111769D9443DA3146B13D06C543C14BA287557C9F41F98B676D02D4EC981F0624B26B4FB58CEAF1FDAAF737DD4A944E1093F15B807A0FF005E0AC1109DDCFD3322283024DAE4D0E8793A3F14FC43E718209E3958CF9756921DA4C0FCB9C8C0DB146BD669A300DBDF74F869D4044DF7A99A18F92470AC2B5D929B5100A0D2E1A7AE02395D0A612D07E23E970C7298715CA63242D975DC1D3C083A25E62492D6A2A20645C9309845566378B8E36BFAC88B36120B6103E2C3019683977D3EEBE380CBBAC8F1ADF74E452F2F96C83D25003B2CDD7F492004F5B98936E8F937E3D64044D8687D2DBBCDF77A6DD12E85A9BC5334EFBD2E2C026C12524EFA9C2A8DDD036B9C7D29BC9ADE5C273D252D17648B28CD8834F83B07A969E9BF39816096234B8BD72A486D8B352A233AE075867B9C12C0668B5AADE2FB8F3D6759A2176B6D9ABA3A6BF81A16129427A49390C2807495170874DED8992D8D4DDFE66602DF17EC3C72295364668FDE9524DB05165A533A1960D6D4A3441082693CCF2F7B669979852FB78F98AD3BF86500CF48B2802ED2BDEC85561EB0C9F2B0D19D2D4732FD08FABEE75920333F417F6C12D08D96478429B54AD2533B7DF056A50EEAD76CB5D872FAEC4CB47A35FC419B348B6792515D6B513E90A0BB04A94759192BF878F44885261511DBB9919B2BBE4DB7FCF78AB1B2F2E64832862275C82B36DDD5AC7D7A3894BB4478ECAECC591BD6C53CC90EBE8E7C0814138A870345BD98F33EFF67C890DC9EB956C59D6F9C840906CA194626FD25B9E3A4F942E4AE4107426890672B035DEADEBAFB68E1E6A0B01338051F322C7AD84E987BF9B63F564F997940B4EBBC532AA4AA14E2DF4050FF49A9A746AB3814BF5D1699BA40C315919EC0D00442CA7C71CFA3C952EAB77C59B7906887667591AF619FA14BA06426DEA7AF5D0C1A12A0300076334B4FD02EC7CD4E54B3F09016EE20FB0A871B39750D5E80CA27E3656B21A6796CCCBB4D439102E55EA6B8727F06D2DAF2B7A19E909C9D567183E27AA8BF20EF34291C0DA7F20A2CE05DB1763BE6A3365F671D3DF58A631E181452E192C0835142C24A3B16BDE3F0ADC2D450215FAD3455071BC0235567C506A7E53E8853583952B01653E7AAC13E9532FAC6C03D1C8B82B87E4D948B9D80BA09611359B0EC4A7F38D6C63FAA597715AEBCC1293288513E838DD2EF1A32ECB4226421CE7F91A7A551CB2FA9A5A65D247EC098FB1F32E06ACAC7D63BB56CE4519D16AE050D28535931155B60AA9F4E17C1FD9A48D19FB73DEC038F8F51A618616A0FA2D52E001D811AD5886C1744BD8BFD76DC69A7619778C4D08F50DC28D27797D9A0A63B0B80B2DDB563360C706157595E3984E1E20865B5045E13324EBC2421BE97F71FB2E464C347B9CEF70FD5320702DCEE9C6E894DE18160B2EB4F2653A6E09136DE4987C0BCF0D855B193187F2E4212692B1B8DB735A26C045235FC4AFB3BEF49DEE87EEDF4C3251B9605304AFB1ADEC3156E64DAB88AD5A20EB772E22DA5532B022069DD32E2E8B5118CEEDAB7063307DEB886166F4FEB47BFA72F1A3A21F03629D4A3EF8581B2FC52F7DA35FEC393A85A68215506E3FD156035421D7330DE9E1E3963C6E792487AABFE95C539C4A7955E15AED3B75D5785444E31E69DDB793EF873B1F2223FE7BFC68F30BE31D41041D7DD59ED0BE8C203F3025229DFA0AF2006F763C6F317EF8A92EC5782C899162EF7814A7AB0737BD89A8DC04832CC7F4A58FE94D5BB973EE6FFE43571B27830B24EACFB76D22A839009A366F1327016D3BAE5ECFAE01CE7C810CFDCFF14381CFC0B4B53E0D1868A8E20C9DDD26B5CF6FEA0F12ED68DA79A3BC90CFAED16B477BB0245D01B654A0B2874239588328EF1EF1DD53696EC29A716FC5FBE8ED0D65DCFC571D7C3BDBE762AB0C638FD42EE065925F253EB124698EF16A56652AD01290450433FE012C1D595AD84F2824DD83FBA869CD778784F099EF3B2862B66DEC9F3F64034F8907F8FCCC7506914D228A11447AF8DFD7E15EAE3BD1521C7EDA14E5C8DC8DF98164329F908D43070639500FFCE603A96339D5EC1663A6A80943D32560B927FA7A02872C1BA9E5329E124A477C51CEC7458738079A11EC34D1734732638CE4A4DE88EF8069361937067D16B104499CA2B794321D62556E17BAE93F03C27B9FDE2B983762DF14509FEE76D01BCD2EB52E90F07916C7F5548ED091F6429EB089B14A5A9F1B917860012910CB09C5047E06D6A4F5A7004A6391C1D5CB9ED043193B1A4569B1211533AC2479036B5ACA6D12E22E8D3FAAF972BD426D1E2FE6C495D6CB9B41ABCFBC58500153981BFE2E3BBA5A3EC3FE1464454D639740E49575091ADDE3A6F07DF3DB5C2ADFEFC2A3C37C1F9BC6E1611C042F1296547DCF5B3DA2E23B859C4FBA79D828360981AA91A8FB020A0539EBD818004CDF84014AB5A64F57EA576E5173F9C3B4676D0792E55C7FC7C152D9D635F811A3FC2DEB2515F30EF01B78971540F13B7FE040248C1531A8801099C5A350C3D28D2680339FF196DFD9F0945E6C87509B94AD334358000E460AD37FE987FDEDE47104DE71469C0874EFC2E4AE00A28799C58C71667F621BCC081879FB5FAB0B5F8D802906928BA65D9239442834BDB0FCD069659E28488FB6838390E1EC5CC8FC5078FAD3F985401E6153D088838FE059BDBA5D48DDEEFEFAC17A3224963A4F25CC62A36B43A72292B81E0BA9BFA69FC56C118420A8C260F741AFFEB2AB9D732829C061BCBCE7C7629590922CBD805DF92E358AFBD7A1B048414BC4188C6FAF34E01CB2B65D10C72A325BF33208E8E9C0D15F22E90D6BEF5CB3E5CE56B8C41844FECA92A0D7B282812A94260FB67EB13BC9718BA7C3B6448E321E2ECDF7037262BA9F128058D8DF7ABA3FB113EBA0CD634AF1F8AF84FEB6FA6DC1CA18304E8017CB59999275AAD06E165879767EC0C86BB371257407009C96D3CC35E32BBE95FE76DC58CCE6028B2B04D661100F3BC0A3D755EAF5C06565B8BB554825BDB87141A8DABA087D1C41B78E09E737EBFC3C831C4511ED78186B98FD06D7E9343BD8DF227BD2C1BB58DD892A32E30F63E8F96A33EC12AAD0ACD6D35C9888C40629CED2FC2F62A4AD7045D4467861781F53BC721D2C59FC1AAACE0D3093077B019E2B05459BF07E65A6180F6ABF4D9C0EF45EABA1B4FDCFF87C2F8908BADCE39BF7208C917A8FE422107FB32E8DED0B87B1BAD4BA74C16363817FB7F0F37756F7F395A66A56D60F41CEFA58A82E62CC6120C2B350AA0FAC5722FAE6EBB528982475B0ABA9C795F7695F15893262930E5196BAAD887A5B4A3E8341F1A14625FD745DBA6CA612B8B71BA39D8C1923D79405D1D85D344D198B4CC1AF5F0219B54537FE234D30AE94F1DDF1EC0F966AA277CEB1B012CCC35086B41AD06CAAA9AE82C4DC3D0CD982E77460F9CC1BD3F3FB1C6007E0AED480DA9A63D9D5503FBBC5A1C44E6E2D2DBF2681F9515E8EE6DCC0B4A45C6F5884D42F69AD7721F689A601DBB0FAAA0C1749743EA55CA3189D74FAB2F89F15EFD3304D8A2C0C164B946A7CF80FE8ED5720E99FECE71C97BA736CF4041CB52F24203FDFDE7E6E9B39561C5B18E6D88FB2BC4B45098140D18628B131189458C0C2EB02415E107A7D7D6AC0975968CEEA0D9882AB5C424E6E4F7123426F9BD8F728018C994590437473B779B3F6DAFC2793E492202ECA1E620B08DC642014A95D9E5602E7B5BCA4F8BAE639820AB2222B5341FFBBAA3F0D3CF66E64FCCB6D676633BA89C3E01AE991FECB4B0CFB34FDFB654F829B4ECB32E5F0126FF4B1864868B01BE14B6BB2B1BE5DF4921152AA32982B5A5A8DD63D23FB407BFA6CF4019658D618A7352D62FA14A6A922EC6CFACE04B80B7D1643FA4049C78D587B1B4B67C36CEDAA74F7DAB4088DA1AB56AFA55725FF04B8494279DF0E316992AD9158BC8E185AA6D3DE06A6B0618B2F3A6965B9376510290D1D6D783C0CAB2E6789EA4CC4D68F463170FC6C864A5EF529D1214CDAE9A319AE1CFEC37B714D66D1FC3A7D2CFCF22F06F384AD584B9439F241C750019F50D27CFB2B785DCFC826ABDE449B2181F96C40C28B2A70994AFCE2A1CF9B57EC5ED4ADCA9955F4F90BC554246D5AA4A85F369E2A1707C591BB93BCEAE1A31F6BBEFB496C23152EB189920F595D23A2F22979F8F85A2A3F6D8F21EF71025090692FEC5F0FAE0AB472E13E0F39F19353E9F509F9CC4DD5577D4421F13CBDFB4E9F0FD471382EF6C75ADDA8039CBF184AD3CDAAE07117FB1365D10113D3F96E6F410B85E0AAD5CD3A25DCAFD1A9F3FDA85D8491FCF7AEC7E2772BBCC2DF78075537FD6785C5F82EAA5BBC58F3F21448F2A467C7EF71BBF84A3A45A5A8E5C50A0B79BE5FCC877CEB8BB7CA26175E92FF334FB2503EB36D0CAE3BD259E3ABC7BDD8A6AA6610DD4576D99DC5BA4DC4FB09EA1029F948FBE1D818902597503BF74016D9FC3888F717D9BB61D39F29A911382DCF284F9D2CFC1FCBEB5C35B812E6B01903672D4117D57349288A5389C79D885CE489757FD2B94850C2A5E7E8271ECCC7F2E09636B748DCD4F65B078CA963BC5B67B5A6FB2285BA0C03FA74A1338576E910DADA6D1CCE33B65D8A9F830682F66C27B4B632BD798357BD7BC6F2C89CF17DBF8E4979F2DC4C27B0A5B3DAE34DA6692E1C878F798A4313ADBB531C444D50DD2013B545FEEFB10BFF01D429A6038843CF5316D8D8CB04DCC7BB91864122256C9ADAD87A39B6438B234E2379A393247C9D1C163DFE34FEA9AB7AE3F4A246DA26E7ECFECD30767A751E2DF4D1B3405A317E8268ED4BEA3E3F89865D8FBA58E96266CF156A1A029BEAEE69CE21FAFF76030B81BED4D3AD8CE1BAA66F66731EA96817ABA6BC3DF53586C788D91A7E5D8CB726CA2B869BB2CA2907829AFD1EB707E7CA844BF2B049F6982D752C333B38A2685A4D60FA7E551B5EFF2DA06A05C839D06BAA44ECB59CD2558B42C59C57DC03F74928B371FC66495418BEF95C43D988160FCD34F36766807F6C999FDC3D3EA212A27F24C98B33FA18DDDD5F2026E81DA544E360ABD63BF1C7C844006E57736060E2D17AAA00CFA2F1D3A3F1E173AB6137E52DD64D628DB134272E0E3720A18C0CBE242D3091F77C92F1E30422D9CB50D23F38118BE56A67FA7302D3758B7C5B7045FE332953244F54296EEC5AAEF4ADD306AD7722268F6F5DB1D1845EE49BF0F0922900109C12A4E526E3BA8CC081CAC206579A9145CA92F930100D1199637D6D4DC9605EAF8DB8BE1F293E3F78C7FABBB91622292CA6B26DC7F3224710A0A3D50F41A815392B7820EB9519365C9C24 Digest: FCD08FFD51822E7CD3241C71BFA1A9F507FCE48B2297EE205095EE53EAF6B725 Test: Verify -Name: SHAKE256 +# +Name: SHAKE-256 Source: Botan 2.10 library # Message: diff --git a/shake.h b/shake.h index 18a1c897..15028e1a 100644 --- a/shake.h +++ b/shake.h @@ -56,7 +56,7 @@ class SHAKE_Final : public SHAKE public: CRYPTOPP_CONSTANT(DIGESTSIZE = (T_Strength == 128 ? 32 : 64)) CRYPTOPP_CONSTANT(BLOCKSIZE = (T_Strength == 128 ? 1344/8 : 1088/8)) - static std::string StaticAlgorithmName() { return "SHAKE" + IntToString(T_Strength); } + static std::string StaticAlgorithmName() { return "SHAKE-" + IntToString(T_Strength); } /// \brief Construct a SHAKE-X message digest SHAKE_Final() : SHAKE(DIGESTSIZE) {}