aboutsummaryrefslogtreecommitdiffstats
path: root/src/engine
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-03-27 19:25:12 +0000
committerlloyd <[email protected]>2009-03-27 19:25:12 +0000
commitfdc5fc1e78d584f6dd46d762ea524bcab20d56e3 (patch)
treea69c10cd9ee6bc75567fe5e3491c3f669f8577ff /src/engine
parent96a6948055bb0a497eab1a9a4a86cb2bb648a5b5 (diff)
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.
Diffstat (limited to 'src/engine')
-rw-r--r--src/engine/def_engine/lookup_block.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/def_engine/lookup_block.cpp b/src/engine/def_engine/lookup_block.cpp
index 64a969dce..06383357b 100644
--- a/src/engine/def_engine/lookup_block.cpp
+++ b/src/engine/def_engine/lookup_block.cpp
@@ -25,8 +25,8 @@
#include <botan/desx.h>
#endif
-#if defined(BOTAN_HAS_GOST)
- #include <botan/gost.h>
+#if defined(BOTAN_HAS_GOST_28147_89)
+ #include <botan/gost_28147.h>
#endif
#if defined(BOTAN_HAS_IDEA)
@@ -143,9 +143,9 @@ Default_Engine::find_block_cipher(const SCAN_Name& request,
return new TripleDES;
#endif
-#if defined(BOTAN_HAS_GOST)
- if(request.algo_name() == "GOST")
- return new GOST;
+#if defined(BOTAN_HAS_GOST_28147_89)
+ if(request.algo_name() == "GOST-28147-89")
+ return new GOST_28147_89;
#endif
#if defined(BOTAN_HAS_IDEA)