5 files changed, 11 insertions, 20 deletions
diff --git a/src/block/aes_intel/info.txt b/src/block/aes_intel/info.txt
index 1a156a635..6e67a6ed9 100644
--- a/src/block/aes_intel/info.txt
+++ b/src/block/aes_intel/info.txt
@@ -2,7 +2,7 @@ define AES_INTEL
 
 load_on auto
 
-#isa aes_ni
+need_isa aes_ni
 
 <requires>
 aes_isa_eng
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index 6bce86dff..6c1c2a7e4 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -29,6 +29,6 @@ barcelona -> k10
 
 <isa_extn>
 sse2:all
-ssse3:core2
+ssse3:core2,nehalem,westmere
 aes_ni:westmere
 </isa_extn>
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.cpp b/src/engine/aes_isa_eng/aes_isa_engine.cpp
index 122ec0f6e..fa3b4ceab 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.cpp
+++ b/src/engine/aes_isa_eng/aes_isa_engine.cpp
@@ -27,12 +27,12 @@ AES_ISA_Engine::find_block_cipher(const SCAN_Name& request,
       {
       if(request.algo_name() == "AES-128")
          return new AES_128_Intel;
-#if 0
+      /*
       if(request.algo_name() == "AES-192")
          return new AES_192_Intel;
       if(request.algo_name() == "AES-256")
          return new AES_256_Intel;
-#endif
+      */
       }
 #endif
 
@@ -40,11 +40,11 @@ AES_ISA_Engine::find_block_cipher(const SCAN_Name& request,
    if(CPUID::has_via_aes())
       {
       if(request.algo_name() == "AES-128")
-         return new AES_128_Via;
+         return new AES_128_VIA;
       if(request.algo_name() == "AES-192")
-         return new AES_192_Via;
+         return new AES_192_VIA;
       if(request.algo_name() == "AES-256")
-         return new AES_256_Via;
+         return new AES_256_VIA;
       }
 #endif
 
diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt
index ee61076b4..7a380753d 100644
--- a/src/hash/sha1_sse2/info.txt
+++ b/src/hash/sha1_sse2/info.txt
@@ -1,19 +1,8 @@
 define SHA1_SSE2
 
+need_isa sse2
+
 <requires>
 sha1
 simd_engine
 </requires>
-
-<arch>
-pentium-m
-pentium4
-prescott
-amd64
-</arch>
-
-<cc>
-gcc
-icc
-msvc
-</cc>
diff --git a/src/timer/cpu_counter/info.txt b/src/timer/cpu_counter/info.txt
index d95e0fec5..2ab1343bc 100644
--- a/src/timer/cpu_counter/info.txt
+++ b/src/timer/cpu_counter/info.txt
@@ -12,10 +12,12 @@ gcc
 </cc>
 
 <arch>
+
 # RDTSC: Pentium and up
 i586
 i686
 athlon
+pentium3
 pentium4
 pentium-m
 amd64