diff options
author | lloyd <[email protected]> | 2010-07-27 13:35:56 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-07-27 13:35:56 +0000 |
commit | 38ece17f845c91579dc19e3bcc8a53edee4eb5ea (patch) | |
tree | 085c1652ab38cf009df843e15d7384b602300d7d /src/engine | |
parent | 15e071575d90bdf21565192109491e05fefb594b (diff) | |
parent | f197c68667c721605f5e3942a09e93bb140cac47 (diff) |
merge of '17389a973545d2f8e25813894cdd2da1b01aa534'
and 'ada4c9893d70affd8934ab9664e390087feab3c9'
Diffstat (limited to 'src/engine')
-rw-r--r-- | src/engine/aes_isa_eng/aes_isa_engine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.cpp b/src/engine/aes_isa_eng/aes_isa_engine.cpp index 682dfe6b1..7f541d583 100644 --- a/src/engine/aes_isa_eng/aes_isa_engine.cpp +++ b/src/engine/aes_isa_eng/aes_isa_engine.cpp @@ -19,7 +19,7 @@ AES_ISA_Engine::find_block_cipher(const SCAN_Name& request, Algorithm_Factory&) const { #if defined(BOTAN_HAS_AES_INTEL) - if(CPUID::has_aes_intel()) + if(CPUID::has_aes_ni()) { if(request.algo_name() == "AES-128") return new AES_128_Intel; |