Skip to content

Commit ee70232

Browse files
author
lolololol
committed
save: fix to dpa TRACE_LENGTH
1 parent e77297d commit ee70232

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

dpa.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import sparkgap.attack
1313

1414
TRACE_OFFSET = 0
15-
TRACE_LENGTH = 17000
15+
TRACE_LENGTH = None
1616
TRACE_MAX = 0
1717

1818
CONFIG_PLOT = True
@@ -116,12 +116,17 @@ def usage():
116116
elif opt == "--txt":
117117
CONFIG_PLOT = False
118118
print("TRACE_OFFSET = %d" % TRACE_OFFSET)
119-
print("TRACE_LENGTH = %d" % TRACE_LENGTH)
119+
if TRACE_LENGTH is None:
120+
print("Delayed loading TRACE_LENGTH")
121+
else:
122+
print("TRACE_LENGTH = %d" % TRACE_LENGTH)
120123
if fn is None:
121124
print("You must specify a file with -f")
122125
sys.exit(0)
123126
print("Stage 1: Loading plaintexts...")
124127
tm = sparkgap.filemanager.TraceManager(fn)
128+
TRACE_LENGTH = len(tm.traces[0]) - TRACE_OFFSET
129+
print("TRACE_LENGTH = %d" % TRACE_LENGTH)
125130
print("Deriving key... wish me luck!")
126131
if CONFIG_PLOT:
127132
resultViz = sparkgap.resultviz.VisualizerApp()

emu/des_loader.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,12 @@
3838
DATA_ADDR = 0x18cc0
3939
OUT_ADDR = 0x18cb0
4040

41-
DODES_END = 0x8974
41+
# DODES_END = 0x8974 # WHOLE
42+
DODES_END = 0x8668 # FIRSTROUND
4243

43-
rand_key = np.array([random.randint(0,0xFF) for i in range(0,8)],dtype=np.uint8)
44+
45+
# rand_key = np.array([random.randint(0,0xFF) for i in range(0,8)],dtype=np.uint8)
46+
rand_key = np.array([0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x88])
4447
key_str = " ".join(["%02x" % x for x in rand_key])
4548

4649
if CONFIG_REKEY is False:

0 commit comments

Comments
 (0)