aboutsummaryrefslogtreecommitdiff
path: root/projects/hsm/cryptech_upload
diff options
context:
space:
mode:
authorPaul Selkirk <paul@psgd.org>2016-07-06 14:48:50 -0400
committerPaul Selkirk <paul@psgd.org>2016-07-06 14:48:50 -0400
commit7edf6494434008d6c0330d413ccdc00eeb956cd9 (patch)
treedb22a79e9f7d705b2a455ba44862a41e259a7b3e /projects/hsm/cryptech_upload
parent737df4630ee9531728ff19b25e3afb2c81710bf6 (diff)
Small improvements to try to suck less.
Diffstat (limited to 'projects/hsm/cryptech_upload')
-rwxr-xr-xprojects/hsm/cryptech_upload15
1 files changed, 10 insertions, 5 deletions
diff --git a/projects/hsm/cryptech_upload b/projects/hsm/cryptech_upload
index 66fbe7d..8bb6ebb 100755
--- a/projects/hsm/cryptech_upload
+++ b/projects/hsm/cryptech_upload
@@ -116,8 +116,8 @@ def _execute(dst, cmd):
pin = getpass.getpass('SO PIN: ')
_write(dst, pin + '\r')
prompt = _read(dst)
- if not prompt.endswith('> '):
- #sys.stderr.write('Device does not seem to be ready for a file transfer (got {!r})\n'.format(prompt))
+ if not prompt.endswith(('> ', '# ')):
+ print('Device does not seem to be ready for a file transfer (got {!r})'.format(prompt))
return prompt
_write(dst, cmd + '\r')
response = _read(dst)
@@ -142,14 +142,18 @@ def send_file(filename, args, dst):
print 'Access denied'
return False
if not 'OK' in response:
- sys.stderr.write('Device did not accept the upload command (got {!r})\n'.format(response))
+ print('Device did not accept the upload command (got {!r})'.format(response))
return False
crc = 0
counter = 0
# 1. Write size of file (4 bytes)
_write(dst, struct.pack('<I', size))
- _read(dst)
+ response = _read(dst)
+ if not response.startswith('Send '):
+ print response
+ return False
+
# 2. Write file contents while calculating CRC-32
while True:
data = src.read(chunk_size)
@@ -178,7 +182,8 @@ def send_file(filename, args, dst):
# 3. Write CRC-32 (4 bytes)
_write(dst, struct.pack('<I', crc))
- _read(dst)
+ response = _read(dst)
+ print response
src.close()