fix skipped cpa computation on 'none' (byte cpa instead of bits cpa)

SideChannelMarvels · Aug 28, 2017 · aa35ac3 · aa35ac3
1 parent 89b4853
commit aa35ac3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/focpa.cpp b/focpa.cpp
@@ -286,7 +286,10 @@ int first_order(Config & conf)
         }
       }
 
-      if ( (bit == bitsperbyte-1) || (bit == -1) ) {
+    if ( ((conf.bitnum == -1) && (bit == bitsperbyte-1))      // 'all' case
+	      || ((conf.bitnum != -1) && (bit >= 0))    // single bit case
+	      || (conf.bitnum == -2))                   // 'none' case
+    {
         int nbest=10; // TODO: make it a config parameter
         sort (sum_bit_corels.back(), sum_bit_corels.back() + n_keys);
         sort (peak_bit_corels.back(), peak_bit_corels.back() + n_keys);