GOST was using a completely non-standard set of sboxes. Change it to use

GostR3411_94_TestParamSet, this is compatible with the implementations in
Crypto++ and OpenSSL. This is not backwards compatible, though once the
implementation supports multiple param sets (which is required, unfortunately,
for compatability with various standards by CryptoCom, who have defined not
one but at least 4 (!!!) different sboxes to use with GOST), I may offer
Botan's previous sbox set as an option.

Since adding the GOST hash function (34.11) and signing algorithm (34.10)
are on the long term agenda (request by Rickard Bondesson, as the Russian
authorities want to use their local standards for their DNSSEC use), I
renamed the block cipher class (which had been just 'GOST') to GOST_28147_89
to minimize future name clashes.

1 files changed, 59 insertions, 20 deletions

diff --git a/checks/validate.dat b/checks/validate.dat
index dd5796cb5..85042c8c6 100644
--- a/checks/validate.dat
+++ b/checks/validate.dat
@@ -4685,27 +4685,66 @@ F48717AE3466F0F5:403CB3AFDA050BFB:\
 DA0EDCDC26C81F71:5E54344C7E8CF8A0:\
 1A34BA494ADC8ED74B6AD1EDAF317DA506FBDA7A0D0DD40C
 
-# GOST vectors randomly generated by the library, not necessarily correct.
-# Update August 11, 2002:
-#   These values disagree with Crypto++ and libmcrypt. Of course,
-#   they can't agree with each other, either...
 [GOST]
-47F02A480FE88FA8:9A2581F0A4A9E349:\
-D1ACB11A840C2EF381AC3DCAF30928DC9A106018217504307FBBA31210BCF40C
-EE0D980BFCDD770E:87BE8CF55B64BE48:\
-3E6C35B1707871A6787CB985F8E3149E7437D2ACAA6EF2894E1835883CCD1D74
-1010C80BED0C3ADF:68D549A82848CBFF:\
-CD6D9B1978DBD8C199B23598B01B2DAB07D4EF75387E00EE54BFADE0F1CB40EC
-5FB5120152E02288:BBF9E60D73585CE9:\
-E9EE3E2637F0E8D02E1A2D2F24C2FA9F9205B53FD8444B0E5B0311A05D5A66F0
-7AEF1F7C83522A9A:6FE38DC481E107B1:\
-57147E0D0028F32C070848494FC2C4DBDAB35867FDF6CD421DBA87CA9A15056D
-37EE6C84FF618FD2:95D8C426D3A2C303:\
-745199C794E97A98CD15A37E19351AEFCC63C8085FE30B6A22FEA4D918E2533E
-9A752C56B9218BB9:EE0F91BB9F2B6D9D:\
-3BBD93E83639416B1A5D24D42029E422DA35C0FB48AB7B5072BC1E4B460113A6
-10CC7DC088D0B4A4:2E77C327E63A5C94:\
-B9D0AA4987CAAB530EF887EDE311355AC007F3E00A58DD42B6C6C8384F0B13B5
+
+# The test vectors included in Crypto++ 5.6.0
+0DF82802B741A292:07F9027DF7F7DF89:\
+BE5EC2006CFF9DCF52354959F1FF0CBFE95061B5A648C10387069C25997C0672
+
+1354EE9C0A11CD4C:4FB50536F960A7B1:\
+B385272AC8D72A5A8B344BC80363AC4D09BF58F41F540624CBCB8FDCF55307D7
+
+6693D492C4B0CC39:670034AC0FA811B5:\
+AEE02F609A35660E4097E546FD3026B032CD107C7D459977ADF489BEF2652262
+
+99E2D13080928D79:8118FF9D3B3CFE7D:\
+320E9D8422165D58911DFC7D8BBB1F81B0ECD924023BF94D9DF7DCF7801240E0
+
+D1E787749C72814C:A083826A790D3E0C:\
+C9F703BBBFC63691BFA3B7B87EA8FD5E8E8EF384EF733F1A61AEF68C8FFA265F
+
+D4C05323A4F7A7B5:4D1F2E6B0D9DE2CE:\
+728FEE32F04B4C654AD7F607D71C660C2C2670D7C999713233149A1C0C17A1F0
+
+8742D9A05F6A3AF6:2F3BB84879D11E52:\
+35FC96402209500FCFDEF5352D1ABB038FE33FC0D9D58512E56370B22BAA133B
+
+F86506DA04E41CB8:96F0A5C77A04F5CE:\
+D416F630BE65B7FE150656183370E07018234EE5DA3D89C4CE9152A03E5BFB77
+
+# Generated by OpenSSL's gost89.c and GostR3411_94_TestParamSet
+# This implementation was written by CryptoCom who is a Russian
+# company active in standardizing GOST usage in the IETF, etc
+
+66320DB73158A35A:4732FE56B7854AF7:\
+67C6697351FF4AEC29CDBAABF2FBE3467CC254F81BE8E78D765A2E63339FC99A
+
+3E017E97EADC6B96:4CDDBE526625E368:\
+255D051758E95ED4ABB2CDC69BB454110E827441213DDC8770E93EA141E1FC67
+
+75D8BE6189F95CBB:4FD8C167F5C05C76:\
+8F385C2AECB03BFB32AF3C54EC18DB5C021AFE43FBFAAA3AFB29D1E6053C7C94
+
+14735AC55E4B7963:DFCD9EFC3FA9BAFB:\
+A8990F95B1EBF1B305EFF700E9A13AE5CA0BCBD0484764BD1F231EA81C7B64C5
+
+0BE11A1C7F23F829:E0BB12ECA3001350:\
+3B706424119E09DCAAD4ACF21B10AF3B33CDE3504847155CBB6F2219BA9B7DF5
+
+167241EC4441196D:2361B9315757145A:\
+FA7F444FD5D2002D294B96C34DC57D297ED55FDA3214D99BD79F7A0EF8972DF2
+
+2EDD19A28A1D950C:0B4CB6EE4CDBC46E:\
+8DAF30DA74AD04F28263CCB577A6504E45CB5C3D628A2F79FC706540B27EAD3F
+
+634BCA6A5D11B73A:990D426E1415B346:\
+8161C1F80712474CDDA3893F2DB8B829291D69DB9C161ACAF3336C7D51018AD2
+
+E9E4E1E217ED0467:83F7B229D74D5068:\
+B5407AE2F9320C225075FDEC8C17B67F4A22FD9B24876D87D238F13049A86AFE
+
+40140A581D78BB49:D48ADCE9AE2DF9A7:\
+620153EE18096E622B6BFE4FF26BD6C4A3C8F4ED705FEB5943CC3B5AB93FC11C
 
 [IDEA]
 D53FABBF94FF8B5F:1D0CB2AF1654820A:729A27ED8F5C3E8BAF16560D14C90B43