aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-01-05 04:30:27 +0000
committerlloyd <[email protected]>2010-01-05 04:30:27 +0000
commit968a4250218d40f3da9eee8ff50432a3169605c6 (patch)
tree8c36caf175c25ed0fa87e3b3b32eebcf486d3757 /src
parenta24f0bc3f513cb9d2c6dc84dab128c42313a55b8 (diff)
Remove stubs for VIA Padlock support. I have no plans to implement it
and don't even have access to a VIA with AES so could not test it anyway. If someone else wants to do it, then the implementation for AES-NI should provide a good template.
Diffstat (limited to 'src')
-rw-r--r--src/engine/aes_isa_eng/aes_isa_engine.cpp17
-rw-r--r--src/utils/cpuid.h8
2 files changed, 1 insertions, 24 deletions
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.cpp b/src/engine/aes_isa_eng/aes_isa_engine.cpp
index 72440c1f5..682dfe6b1 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.cpp
+++ b/src/engine/aes_isa_eng/aes_isa_engine.cpp
@@ -6,17 +6,12 @@
*/
#include <botan/internal/aes_isa_engine.h>
-
#include <botan/cpuid.h>
#if defined(BOTAN_HAS_AES_INTEL)
#include <botan/aes_intel.h>
#endif
-#if defined(BOTAN_HAS_AES_VIA)
- #include <botan/aes_via.h>
-#endif
-
namespace Botan {
BlockCipher*
@@ -35,18 +30,6 @@ AES_ISA_Engine::find_block_cipher(const SCAN_Name& request,
}
#endif
-#if defined(BOTAN_HAS_AES_VIA)
- if(CPUID::has_aes_via())
- {
- if(request.algo_name() == "AES-128")
- return new AES_128_VIA;
- if(request.algo_name() == "AES-192")
- return new AES_192_VIA;
- if(request.algo_name() == "AES-256")
- return new AES_256_VIA;
- }
-#endif
-
return 0;
}
diff --git a/src/utils/cpuid.h b/src/utils/cpuid.h
index 2c9599899..1de97f129 100644
--- a/src/utils/cpuid.h
+++ b/src/utils/cpuid.h
@@ -21,7 +21,7 @@ class BOTAN_DLL CPUID
CPUID_SSSE3_BIT = 41,
CPUID_SSE41_BIT = 51,
CPUID_SSE42_BIT = 52,
- CPUID_INTEL_AES_BIT = 57,
+ CPUID_INTEL_AES_BIT = 57
};
/**
@@ -66,12 +66,6 @@ class BOTAN_DLL CPUID
{ return ((x86_processor_flags() >> CPUID_INTEL_AES_BIT) & 1); }
/**
- * Check if the processor supports VIA's AES instructions
- * (not implemented)
- */
- static bool has_aes_via() { return false; }
-
- /**
* Check if the processor supports AltiVec/VMX
*/
static bool has_altivec();