VivoKey/vsmartcard
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

nPA: removed --ca-pubkey command line option

Browse Source 
The public key is extracted from the EF.CardSecurity instead.
This commit is contained in:
Frank Morgner
2012-10-01 23:40:18 +02:00
parent 4f6945917e
commit c92d923fc8
3 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
virtualsmartcard/src/vpicc/vicc.in
View File

@@ -73,10 +73,6 @@ npa.add_argument("-k", "--ca-key",
action="store",
type=argparse.FileType('rb'),
help="CA private key.")
npa.add_argument("-p", "--ca-pubkey",
action="store",
type=argparse.FileType('rb'),
help="CA public key.")
npa.add_argument("-c", "--ca",
action="store",
type=str,
@@ -93,7 +89,6 @@ from virtualsmartcard.VirtualSmartcard import VirtualICC
ef_cardsecurity_data = None
ef_cardaccess_data = None
ca_key_data = None
ca_pubkey_data = None
if (args.ef_cardsecurity):
ef_cardsecurity_data = args.ef_cardsecurity.read()
args.ef_cardsecurity.close()
@@ -103,12 +98,9 @@ if (args.ef_cardaccess):
if (args.ca_key):
ca_key_data = args.ca_key.read()
args.ca_key.close()
if (args.ca_pubkey):
ca_pubkey_data = args.ca_pubkey.read()
args.ca_pubkey.close()
vicc = VirtualICC(args.file, args.type,
args.hostname, args.port, readernum=args.reader,
ef_cardaccess=ef_cardaccess_data, ef_cardsecurity=ef_cardsecurity_data, ca_pubkey=ca_pubkey_data,
ef_cardaccess=ef_cardaccess_data, ef_cardsecurity=ef_cardsecurity_data,
ca_key=ca_key_data, ca=args.ca, disable_checks=args.disable_checks)
vicc.run()