diff options
| author | lloyd <[email protected]> | 2011-04-22 13:08:05 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2011-04-22 13:08:05 +0000 |
| commit | 8b40f974e65b7cc7d21a8e72b5f18f6e14208e57 (patch) | |
| tree | 1192bdf14dbab29218db64abbef9ec0217ce30c8 /src/engine/asm_engine | |
| parent | 7b96a4844bf97b9c04a18565334e21dc89b8ba0b (diff) | |
Rename all references of ia32 to x86-32 and amd64 to x86-64.
Back the reported version from 1.10.0 to 1.9.17 for the time
being. Still on the fence if this will be 1.10.0 or another release
candidate instead.
Diffstat (limited to 'src/engine/asm_engine')
| -rw-r--r-- | src/engine/asm_engine/asm_engine.cpp | 44 | ||||
| -rw-r--r-- | src/engine/asm_engine/asm_engine.h | 4 |
2 files changed, 24 insertions, 24 deletions
diff --git a/src/engine/asm_engine/asm_engine.cpp b/src/engine/asm_engine/asm_engine.cpp index 747e8c00f..6d475136f 100644 --- a/src/engine/asm_engine/asm_engine.cpp +++ b/src/engine/asm_engine/asm_engine.cpp @@ -7,24 +7,24 @@ #include <botan/internal/asm_engine.h> -#if defined(BOTAN_HAS_SERPENT_IA32) - #include <botan/serp_ia32.h> +#if defined(BOTAN_HAS_SERPENT_X86_32) + #include <botan/serp_x86_32.h> #endif -#if defined(BOTAN_HAS_MD4_IA32) - #include <botan/md4_ia32.h> +#if defined(BOTAN_HAS_MD4_X86_32) + #include <botan/md4_x86_32.h> #endif -#if defined(BOTAN_HAS_MD5_IA32) - #include <botan/md5_ia32.h> +#if defined(BOTAN_HAS_MD5_X86_32) + #include <botan/md5_x86_32.h> #endif -#if defined(BOTAN_HAS_SHA1_AMD64) - #include <botan/sha1_amd64.h> +#if defined(BOTAN_HAS_SHA1_X86_64) + #include <botan/sha1_x86_64.h> #endif -#if defined(BOTAN_HAS_SHA1_IA32) - #include <botan/sha1_ia32.h> +#if defined(BOTAN_HAS_SHA1_X86_32) + #include <botan/sha1_x86_32.h> #endif namespace Botan { @@ -35,8 +35,8 @@ Assembler_Engine::find_block_cipher(const SCAN_Name& request, { if(request.algo_name() == "Serpent") { -#if defined(BOTAN_HAS_SERPENT_IA32) - return new Serpent_IA32; +#if defined(BOTAN_HAS_SERPENT_X86_32) + return new Serpent_X86_32; #endif } @@ -47,24 +47,24 @@ HashFunction* Assembler_Engine::find_hash(const SCAN_Name& request, Algorithm_Factory&) const { -#if defined(BOTAN_HAS_MD4_IA32) +#if defined(BOTAN_HAS_MD4_X86_32) if(request.algo_name() == "MD4") - return new MD4_IA32; + return new MD4_X86_32; #endif -#if defined(BOTAN_HAS_MD5_IA32) +#if defined(BOTAN_HAS_MD5_X86_32) if(request.algo_name() == "MD5") - return new MD5_IA32; + return new MD5_X86_32; #endif if(request.algo_name() == "SHA-160") - { -#if defined(BOTAN_HAS_SHA1_AMD64) - return new SHA_160_AMD64; -#elif defined(BOTAN_HAS_SHA1_IA32) - return new SHA_160_IA32; + { +#if defined(BOTAN_HAS_SHA1_X86_64) + return new SHA_160_X86_64; +#elif defined(BOTAN_HAS_SHA1_X86_32) + return new SHA_160_X86_32; #endif - } + } return 0; } diff --git a/src/engine/asm_engine/asm_engine.h b/src/engine/asm_engine/asm_engine.h index e3e9a546c..bd82566d3 100644 --- a/src/engine/asm_engine/asm_engine.h +++ b/src/engine/asm_engine/asm_engine.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_IA32_ASM_ENGINE_H__ -#define BOTAN_IA32_ASM_ENGINE_H__ +#ifndef BOTAN_X86_32_ASM_ENGINE_H__ +#define BOTAN_X86_32_ASM_ENGINE_H__ #include <botan/engine.h> |