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

add -k to specify keyno

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-12-13 14:23:21 +09:00
parent 76207e7e8d
commit cefdc0db0b
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@
(mpi_exp_mod): Only allocate N-n * 2 for T.
Only allocate N->n for X, W[i], and RR.
2013-12-13 Niibe Yutaka <gniibe@fsij.org>
* tool/upgrade_by_passwd.py (main): Support -k to specify KEYNO.
2013-12-13 Niibe Yutaka <gniibe@fsij.org>
* src/usb_ctrl.c (HID_LED_STATUS_CARDCHANGE): Rename from

18
tool/upgrade_by_passwd.py
View File

@@ -32,7 +32,7 @@ BY_ADMIN = 3
KEYNO_FOR_AUTH=2
def main(passwd, data_regnual, data_upgrade):
def main(keyno, passwd, data_regnual, data_upgrade):
l = len(data_regnual)
if (l & 0x03) != 0:
data_regnual = data_regnual.ljust(l + 4 - (l & 0x03), chr(0))
@@ -45,7 +45,6 @@ def main(passwd, data_regnual, data_upgrade):
gnuk = get_gnuk_device()
gnuk.cmd_verify(BY_ADMIN, passwd)
keyno = 0
gnuk.cmd_write_binary(1+keyno, rsa_raw_pubkey, False)
gnuk.cmd_select_openpgp()
@@ -94,10 +93,17 @@ if __name__ == '__main__':
exit(1)
passwd = DEFAULT_PW3
if len(sys.argv) > 1 and sys.argv[1] == '-p':
from getpass import getpass
passwd = getpass("Admin password: ")
keyno = 0
print sys.argv
while len(sys.argv) > 3:
option = sys.argv[1]
sys.argv.pop(1)
if option == '-p':
from getpass import getpass
passwd = getpass("Admin password: ")
elif option == '-k':
keyno = int(sys.argv[1])
sys.argv.pop(1)
filename_regnual = sys.argv[1]
filename_upgrade = sys.argv[2]
f = open(filename_regnual)
@@ -109,4 +115,4 @@ if __name__ == '__main__':
f.close()
print "%s: %d" % (filename_upgrade, len(data_upgrade))
# First 4096-byte in data_upgrade is SYS, so, skip it.
main(passwd, data_regnual, data_upgrade[4096:])
main(keyno, passwd, data_regnual, data_upgrade[4096:])