Skip to content

Commit e09d09e

Browse files
c0d3dc0d3d
committed
More integration work
1 parent df654ca commit e09d09e

11 files changed

Lines changed: 84 additions & 80 deletions

‎onlykey/cli.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ def prompt_pin():
7474
print
7575
print ('Enter ECC key slot number to use (1 - 32) or enter 0 to list key labels')
7676
print
77-
slot = int(raw_input())
77+
slot = int(input())
7878

7979
while slot == 0:
8080
ok.displaykeylabels()
8181
print
8282
print ('Enter ECC key slot number to use (1 - 32) or enter 0 to list key labels')
8383
print
84-
slot = int(raw_input())
84+
slot = int(input())
8585

8686
slot = slot + 100 # ECC keys in slot 101 - 132
8787
only_key.set_ecc_key(slot, (1+16+32+64+128), raw_privkey) #set ECC key with all features
@@ -100,13 +100,13 @@ def prompt_pin():
100100
only_key.send_message(msg=msg)
101101
print(only_key.read_string())
102102
print
103-
raw_input('Press the Enter key once you are done')
103+
input('Press the Enter key once you are done')
104104
only_key.send_message(msg=msg)
105105
print(only_key.read_string())
106106
only_key.send_message(msg=msg)
107107
print(only_key.read_string())
108108
print
109-
raw_input('Press the Enter key once you are done')
109+
input('Press the Enter key once you are done')
110110
only_key.send_message(msg=msg)
111111
print(only_key.read_string())
112112
print
@@ -115,13 +115,13 @@ def prompt_pin():
115115
only_key.send_message(msg=msg)
116116
print(only_key.read_string() + ' for second profile')
117117
print
118-
raw_input('Press the Enter key once you are done')
118+
input('Press the Enter key once you are done')
119119
only_key.send_message(msg=msg)
120120
print(only_key.read_string() + ' for second profile')
121121
only_key.send_message(msg=msg)
122122
print(only_key.read_string())
123123
print
124-
raw_input('Press the Enter key once you are done')
124+
input('Press the Enter key once you are done')
125125
only_key.send_message(msg=msg)
126126
print(only_key.read_string())
127127
print
@@ -130,13 +130,13 @@ def prompt_pin():
130130
only_key.send_message(msg=msg)
131131
print(only_key.read_string())
132132
print
133-
raw_input('Press the Enter key once you are done')
133+
input('Press the Enter key once you are done')
134134
only_key.send_message(msg=msg)
135135
print(only_key.read_string())
136136
only_key.send_message(msg=msg)
137137
print(only_key.read_string())
138138
print
139-
raw_input('Press the Enter key once you are done')
139+
input('Press the Enter key once you are done')
140140
only_key.send_message(msg=msg)
141141
print(only_key.read_string())
142142
print
@@ -329,13 +329,13 @@ def mprompt():
329329
only_key.send_message(msg=msg)
330330
print(only_key.read_string())
331331
print
332-
raw_input('Press the Enter key once you are done')
332+
input('Press the Enter key once you are done')
333333
only_key.send_message(msg=msg)
334334
print(only_key.read_string())
335335
only_key.send_message(msg=msg)
336336
print(only_key.read_string())
337337
print
338-
raw_input('Press the Enter key once you are done')
338+
input('Press the Enter key once you are done')
339339
only_key.send_message(msg=msg)
340340
print(only_key.read_string())
341341
print
@@ -344,13 +344,13 @@ def mprompt():
344344
only_key.send_message(msg=msg)
345345
print(only_key.read_string() + ' for second profile')
346346
print
347-
raw_input('Press the Enter key once you are done')
347+
input('Press the Enter key once you are done')
348348
only_key.send_message(msg=msg)
349349
print(only_key.read_string() + ' for second profile')
350350
only_key.send_message(msg=msg)
351351
print(only_key.read_string())
352352
print
353-
raw_input('Press the Enter key once you are done')
353+
input('Press the Enter key once you are done')
354354
only_key.send_message(msg=msg)
355355
print(only_key.read_string())
356356
print
@@ -359,13 +359,13 @@ def mprompt():
359359
only_key.send_message(msg=msg)
360360
print(only_key.read_string())
361361
print
362-
raw_input('Press the Enter key once you are done')
362+
input('Press the Enter key once you are done')
363363
only_key.send_message(msg=msg)
364364
print(only_key.read_string())
365365
only_key.send_message(msg=msg)
366366
print(only_key.read_string())
367367
print
368-
raw_input('Press the Enter key once you are done')
368+
input('Press the Enter key once you are done')
369369
only_key.send_message(msg=msg)
370370
print(only_key.read_string())
371371
print

0 commit comments

Comments
 (0)