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

update

Browse Source
This commit is contained in:
NIIBE Yutaka
2012-05-31 15:03:31 +09:00
parent fa2ae42e69
commit 41633871fe
2 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
NEWS
View File

@@ -1,5 +1,18 @@
Gnuk NEWS - User visible changes Gnuk NEWS - User visible changes
* Major changes in Gnuk 0.19
Released 2012-06-XX, by NIIBE Yutaka
** System service blocks at the beginning of flash ROM.
** USB strings for revision detail, configure options, and system service.
** Firmware upgrade feature
** New tool: gnuk_upgrade.py
* Major changes in Gnuk 0.18 * Major changes in Gnuk 0.18
Released 2012-05-15, by NIIBE Yutaka Released 2012-05-15, by NIIBE Yutaka

13
tool/gnuk_upgrade.py
View File

@@ -359,7 +359,7 @@ def to_string(t):
result += chr(c) result += chr(c)
return result return result
def main(passwd, data_regnual, data_upgrade): def main(data_regnual, data_upgrade):
data_regnual += pack('<i', binascii.crc32(data_regnual)) data_regnual += pack('<i', binascii.crc32(data_regnual))
dev, config, intf = get_ccid_device() dev, config, intf = get_ccid_device()
@@ -371,10 +371,9 @@ def main(passwd, data_regnual, data_upgrade):
raise ValueError, "No ICC present" raise ValueError, "No ICC present"
elif icc.icc_get_status() == 1: elif icc.icc_get_status() == 1:
icc.icc_power_on() icc.icc_power_on()
icc.cmd_verify(3, passwd)
icc.cmd_select_openpgp() icc.cmd_select_openpgp()
challenge = icc.cmd_get_challenge() challenge = icc.cmd_get_challenge()
signed = to_string(challenge) signed = XXX__here_needs_really_sign_it_pkcs1__XXX_to_string(challenge)
icc.cmd_external_authenticate(signed) icc.cmd_external_authenticate(signed)
icc.stop_gnuk() icc.stop_gnuk()
mem_info = icc.mem_info() mem_info = icc.mem_info()
@@ -404,14 +403,8 @@ def main(passwd, data_regnual, data_upgrade):
reg.reset_device() reg.reset_device()
return 0 return 0
DEFAULT_PW3 = "12345678"
if __name__ == '__main__': if __name__ == '__main__':
passwd = DEFAULT_PW3
if sys.argv[1] == '-p':
from getpass import getpass
passwd = getpass("Admin password: ")
sys.argv.pop(1)
filename_regnual = sys.argv[1] filename_regnual = sys.argv[1]
filename_upgrade = sys.argv[2] filename_upgrade = sys.argv[2]
f = open(filename_regnual) f = open(filename_regnual)
@@ -422,4 +415,4 @@ if __name__ == '__main__':
data_upgrade = f.read() data_upgrade = f.read()
f.close() f.close()
print "%s: %d" % (filename_upgrade, len(data_upgrade)) print "%s: %d" % (filename_upgrade, len(data_upgrade))
main(passwd, data_regnual, data_upgrade[4096:]) main(data_regnual, data_upgrade[4096:])