deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fileid change/cleanup

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-05-17 12:15:24 +09:00
parent a921d408c5
commit 429c6f3d8b
6 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tool/gnuk_put_binary.py
View File

@@ -125,16 +125,16 @@ def main(fileid, is_update, data, passwd):
gnuk.cmd_verify(BY_ADMIN, passwd)
gnuk.cmd_write_binary(fileid, data, is_update)
if fileid == 0:
gnuk.cmd_select_openpgp()
data_in_device = gnuk.cmd_get_data(0x7f, 0x21)
compare(data[:-2], data_in_device)
elif fileid == 2:
gnuk.cmd_select_openpgp()
data_in_device = gnuk.cmd_get_data(0x00, 0x4f)
for d in data_in_device:
print "%02x" % d,
print
compare(data, data_in_device[8:])
elif fileid == 1:
gnuk.cmd_select_openpgp()
data_in_device = gnuk.cmd_get_data(0x7f, 0x21)
compare(data[:-2], data_in_device)
gnuk.connection.disconnect()
return 0
@@ -152,7 +152,7 @@ if __name__ == '__main__':
else:
is_update = False
if sys.argv[1] == '-s':
fileid = 2 # serial number
fileid = 0 # serial number
filename = sys.argv[2]
f = open(filename)
email = os.environ['EMAIL']
@@ -168,7 +168,7 @@ if __name__ == '__main__':
print "Writing serial number"
data = binascii.unhexlify(serial_data_hex)
else:
fileid = 0 # Card holder certificate
fileid = 1 # Card holder certificate
filename = sys.argv[1]
f = open(filename)
data = f.read()

18
tool/gnuk_put_binary_libusb.py
View File

@@ -241,7 +241,7 @@ def main(fileid, is_update, data):
else:
icc.cmd_write_binary(fileid, data)
icc.cmd_select_openpgp()
if fileid == 0:
if fileid == 1:
data = data[:-2]
data_in_device = icc.cmd_get_data(0x7f, 0x21)
compare(data, data_in_device)
@@ -255,7 +255,7 @@ if __name__ == '__main__':
else:
is_update = False
if sys.argv[1] == '-s':
fileid = 2 # serial number
fileid = 0 # serial number
filename = sys.argv[2]
f = open(filename)
email = os.environ['EMAIL']
@@ -270,20 +270,8 @@ if __name__ == '__main__':
exit(1)
print "Writing serial number"
data = binascii.unhexlify(serial_data_hex)
elif sys.argv[1] == '-r':
fileid = 1 # Random number bits
if len(sys.argv) == 3:
filename = sys.argv[2]
f = open(filename)
else:
filename = stdin
f = sys.stdin
data = f.read()
f.close()
print "%s: %d" % (filename, len(data))
print "Updating random bits"
else:
fileid = 0 # Card holder certificate
fileid = 1 # Card holder certificate
filename = sys.argv[1]
f = open(filename)
data = f.read()