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

-p option for gnuk_put_binary.py

Browse Source
This commit is contained in:
NIIBE Yutaka
2011-05-12 11:06:20 +09:00
parent 96de962cfc
commit 112a9f51c2
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -1,5 +1,7 @@
2011-05-12 NIIBE Yutaka <gniibe@fsij.org> 2011-05-12 NIIBE Yutaka <gniibe@fsij.org>
* tool/gnuk_put_binary.py (main): Add -p option to enter password.
* src/ac.c (verify_user_0): New. * src/ac.c (verify_user_0): New.
(verify_pso_cds, verify_admin_0): Use verify_user_0. (verify_pso_cds, verify_admin_0): Use verify_user_0.
* src/openpgp.c (cmd_change_password): Use verify_user_0. * src/openpgp.c (cmd_change_password): Use verify_user_0.

11
tool/gnuk_put_binary.py
View File

@@ -94,14 +94,14 @@ def compare(data_original, data_in_device):
DEFAULT_PW3 = "12345678" DEFAULT_PW3 = "12345678"
BY_ADMIN = 3 BY_ADMIN = 3
def main(fileid, is_update, data): def main(fileid, is_update, data, passwd):
gnuk = GnukToken() gnuk = GnukToken()
gnuk.connection.connect() gnuk.connection.connect()
print "Token:", gnuk.connection.getReader() print "Token:", gnuk.connection.getReader()
print "ATR:", toHexString( gnuk.connection.getATR() ) print "ATR:", toHexString( gnuk.connection.getATR() )
gnuk.cmd_verify(BY_ADMIN, DEFAULT_PW3) gnuk.cmd_verify(BY_ADMIN, passwd)
gnuk.cmd_write_binary(fileid, data, is_update) gnuk.cmd_write_binary(fileid, data, is_update)
if fileid == 0: if fileid == 0:
gnuk.cmd_select_openpgp() gnuk.cmd_select_openpgp()
@@ -113,6 +113,11 @@ def main(fileid, is_update, data):
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)
if sys.argv[1] == '-u': if sys.argv[1] == '-u':
is_update = True is_update = True
sys.argv.pop(1) sys.argv.pop(1)
@@ -155,4 +160,4 @@ if __name__ == '__main__':
print "%s: %d" % (filename, len(data)) print "%s: %d" % (filename, len(data))
data += "\x90\x00" data += "\x90\x00"
print "Updating card holder certificate" print "Updating card holder certificate"
main(fileid, is_update, data) main(fileid, is_update, data, passwd)