Commit 6e1b5c82 by lwc-tester

new test for uno template

parent 4f66bd7f
...@@ -16,8 +16,6 @@ from test_common import ( ...@@ -16,8 +16,6 @@ from test_common import (
def get_serial(): def get_serial():
ports = serial.tools.list_ports.comports() ports = serial.tools.list_ports.comports()
for port in ports:
print(port.serial_number)
devices = [ devices = [
p.device p.device
for p in ports for p in ports
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
import os import os
import sys import sys
import time
import subprocess import subprocess
import serial.tools.list_ports import serial.tools.list_ports
from test_common import ( from test_common import (
LogicMultiplexerTimeMeasurements, LogicMultiplexerTimeMeasurements,
parse_nist_aead_test_vectors, parse_nist_aead_test_vectors,
DeviceUnderTestAeadUARTP, DeviceUnderTestAeadUARTP,
compare_dumps,
eprint, eprint,
run_nist_aead_test_line, run_nist_aead_test_line,
) )
...@@ -16,8 +16,6 @@ from test_common import ( ...@@ -16,8 +16,6 @@ from test_common import (
def get_serial(): def get_serial():
ports = serial.tools.list_ports.comports() ports = serial.tools.list_ports.comports()
for port in ports:
print(port.serial_number)
devices = [ devices = [
p.device p.device
for p in ports for p in ports
...@@ -28,7 +26,6 @@ def get_serial(): ...@@ -28,7 +26,6 @@ def get_serial():
class ESP32(DeviceUnderTestAeadUARTP): class ESP32(DeviceUnderTestAeadUARTP):
RAM_SIZE = 0x5000
def __init__(self, build_dir): def __init__(self, build_dir):
DeviceUnderTestAeadUARTP.__init__(self) DeviceUnderTestAeadUARTP.__init__(self)
...@@ -68,11 +65,20 @@ def main(argv): ...@@ -68,11 +65,20 @@ def main(argv):
dut.flash() dut.flash()
dut.ser = serial.Serial( ser = serial.Serial(
get_serial(), get_serial(),
baudrate=500000, baudrate=500000,
timeout=5) timeout=5)
ser.setDTR(False) # IO0=HIGH
ser.setRTS(True) # EN=LOW, chip in reset
time.sleep(0.1)
ser.setDTR(False) # IO0=HIGH
ser.setRTS(False) # EN=HIGH, chip out of reset
time.sleep(1)
dut.ser = ser
dut.prepare() dut.prepare()
sys.stdout.write("Board prepared\n") sys.stdout.write("Board prepared\n")
sys.stdout.flush() sys.stdout.flush()
......
...@@ -16,8 +16,6 @@ from test_common import ( ...@@ -16,8 +16,6 @@ from test_common import (
def get_serial(): def get_serial():
ports = serial.tools.list_ports.comports() ports = serial.tools.list_ports.comports()
for port in ports:
print(port.serial_number)
devices = [ devices = [
p.device p.device
for p in ports for p in ports
......
...@@ -3,188 +3,99 @@ ...@@ -3,188 +3,99 @@
import os import os
import sys import sys
import time import time
import struct
import serial
import subprocess import subprocess
import serial.tools.list_ports
from test_common import (
LogicMultiplexerTimeMeasurements,
parse_nist_aead_test_vectors,
DeviceUnderTestAeadUARTP,
eprint,
run_nist_aead_test_line,
)
def get_serial():
ports = serial.tools.list_ports.comports()
devices = [
p.device
for p in ports
if (p.vid == 0x1A86 and p.pid == 0x7523)
]
devices.sort()
return devices[0]
class ESP32(DeviceUnderTestAeadUARTP):
def eprint(*args, **kargs): def __init__(self, build_dir):
print(*args, file=sys.stderr, **kargs) DeviceUnderTestAeadUARTP.__init__(self)
self.build_dir = build_dir
def flash(tty=None): def flash(self):
pipe = subprocess.PIPE pipe = subprocess.PIPE
previous_dir = os.path.abspath(os.curdir)
os.chdir(self.build_dir)
cmd = ['platformio', 'run', '-e', 'uno', '--target', 'upload'] cmd = ['platformio', 'run', '-e', 'uno', '--target', 'upload']
if tty is not None: cmd.extend(['--upload-port', get_serial()])
cmd.extend(['--upload-port', tty]) cmd.extend(['--upload-port', get_serial()])
p = subprocess.Popen(cmd, p = subprocess.Popen(
stdout=sys.stderr, stdin=pipe) cmd, stdout=sys.stderr, stdin=pipe)
stdout, stderr = p.communicate("") stdout, stderr = p.communicate("")
eprint("Firmware flashed.")
os.chdir(previous_dir)
def get_serial(): def dump_ram(self):
import serial.tools.list_ports return None
ports = serial.tools.list_ports.comports()
devices = [ p.device for p in ports ]
devices.sort()
return devices[-1]
class UARTP:
def __init__(self, ser):
UARTP.SYN = 0xf9
UARTP.FIN = 0xf3
self.ser = ser
def uart_read(self):
r = self.ser.read(1)
if len(r) != 1:
raise Exception("Serial read error")
return r[0]
def uart_write(self, c):
b = struct.pack("B", c)
r = self.ser.write(b)
if r != len(b):
raise Exception("Serial write error")
return r
def send(self, buf):
self.uart_write(UARTP.SYN)
len_ind_0 = 0xff & len(buf)
len_ind_1 = 0xff & (len(buf) >> 7)
if len(buf) < 128:
self.uart_write(len_ind_0)
else:
self.uart_write(len_ind_0 | 0x80)
self.uart_write(len_ind_1)
fcs = 0
for i in range(len(buf)):
info = buf[i]
fcs = (fcs + info) & 0xff
self.uart_write(buf[i])
fcs = (0xff - fcs) & 0xff
self.uart_write(fcs)
self.uart_write(UARTP.FIN)
eprint("sent frame '%s'" % buf.hex())
def recv(self):
tag_old = UARTP.FIN
while 1:
tag = tag_old
while 1:
if tag_old == UARTP.FIN:
if tag == UARTP.SYN:
break
tag_old = tag
tag = self.uart_read()
tag_old = tag
l = self.uart_read()
if l & 0x80:
l &= 0x7f
l |= self.uart_read() << 7
fcs = 0
buf = []
for i in range(l):
info = self.uart_read()
buf.append(info)
fcs = (fcs + info) & 0xff
fcs = (fcs + self.uart_read()) & 0xff
tag = self.uart_read()
if fcs == 0xff:
if tag == UARTP.FIN:
buf = bytes(buf)
eprint("rcvd frame '%s'" % buf.hex())
if len(buf) >= 1 and buf[0] == 0xde:
sys.stderr.buffer.write(buf[1:])
sys.stderr.flush()
else:
return buf
def stdin_read(n):
b = sys.stdin.buffer.read(n)
if len(b) != n:
sys.exit(1)
return b
def main(argv):
if len(argv) != 3:
print("Usage: test LWC_AEAD_KAT.txt build_dir")
return 1
def stdin_readvar(): kat = list(parse_nist_aead_test_vectors(argv[1]))
l = stdin_read(4) build_dir = argv[2]
(l, ) = struct.unpack("<I", l)
v = stdin_read(l)
return v
dut = ESP32(build_dir)
def main(argv): try:
eprint(argv[0]) tool = LogicMultiplexerTimeMeasurements(0x0c00)
script_dir = os.path.split(argv[0])[0] tool.begin_measurement()
if len(script_dir) > 0:
os.chdir(script_dir)
dev = get_serial() dut.flash()
flash(dev)
eprint("Flashed")
time.sleep(0.1)
ser = serial.Serial(dev, baudrate=115200, timeout=5) ser = serial.Serial(
uartp = UARTP(ser) get_serial(),
baudrate=115200,
timeout=5)
ser.setDTR(True) ser.setDTR(True)
time.sleep(0.01) time.sleep(0.01)
ser.setDTR(False) ser.setDTR(False)
time.sleep(1) time.sleep(1)
exp_hello = b"Hello, World!" dut.ser = ser
hello = ser.read(len(exp_hello))
if hello != exp_hello:
eprint("Improper board initialization message: ")
return 1
eprint("Board initialized properly")
sys.stdout.write("Hello, World!\n")
sys.stdout.flush()
while 1: dut.prepare()
action = stdin_read(1)[0] sys.stdout.write("Board prepared\n")
eprint("Command %c from stdin" % action)
if action in b"ackmps":
v = stdin_readvar()
uartp.send(struct.pack("B", action) + v)
ack = uartp.recv()
if len(ack) != 1 or ack[0] != action:
raise Exception("Unacknowledged variable transfer")
eprint("Var %c successfully sent to board" % action)
elif action in b"ACKMPS":
c = struct.pack("B", action)
uartp.send(c)
v = uartp.recv()
if len(v) < 1 or v[0] != action:
raise Exception("Could not obtain variable from board")
v = v[1:]
eprint("Var %c received from board: %s" % (action, v.hex()))
l = struct.pack("<I", len(v))
sys.stdout.buffer.write(l + v)
sys.stdout.flush() sys.stdout.flush()
elif action in b"ed": for i, m, ad, k, npub, c in kat:
c = struct.pack("B", action) tool.arm()
uartp.send(c) run_nist_aead_test_line(dut, i, m, ad, k, npub, c)
ack = uartp.recv() tool.unarm()
if len(ack) < 1 or ack[0] != action:
raise Exception("Unacknowledged variable transfer")
eprint("Operation %c completed successfully" % action)
else: except Exception as ex:
raise Exception("Unknown action %c" % action) print("TEST FAILED")
raise ex
finally:
return 0 tool.end_measurement()
sys.stdout.flush()
sys.stderr.flush()
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment