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

added option for cvc and x509 directory

Browse Source
This commit is contained in:
Frank Morgner
2013-02-25 23:56:22 +01:00
parent 0644c491c5
commit 233816656a
4 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
npa/src/Makefile.am
View File

@@ -1,10 +1,12 @@
do_subst = $(SED) \ do_subst = $(SED) \
-e 's,[@]CVCDIR[@],$(CVCDIR),g' \
-e 's,[@]PACKAGE[@],$(PACKAGE),g' \ -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
-e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
-e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \ -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g' \
-e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \ -e 's,[@]PACKAGE_TARNAME[@],$(PACKAGE_TARNAME),g' \
-e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
-e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \ -e 's,[@]PACKAGE_URL[@],$(PACKAGE_URL),g' \
-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
-e 's,[@]X509DIR[@],$(X509DIR),g'
BUILT_SOURCES = cmdline.h cmdline.c BUILT_SOURCES = cmdline.h cmdline.c

4
npa/src/npa-tool.c
View File

@@ -348,6 +348,10 @@ main (int argc, char **argv)
npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA; npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA;
if (cmdline.disable_ca_checks_flag) if (cmdline.disable_ca_checks_flag)
npa_default_flags |= NPA_FLAG_DISABLE_CHECK_CA; npa_default_flags |= NPA_FLAG_DISABLE_CHECK_CA;
if (cmdline.cvc_dir_given)
cvc_default_dir = cmdline.cvc_dir_arg;
if (cmdline.x509_dir_given)
x509_default_dir = cmdline.cvc_dir_arg;
if (cmdline.info_flag) if (cmdline.info_flag)

14
npa/src/npa-tool.ggo.in
View File

@@ -74,10 +74,22 @@ option "auxiliary-data" A
typestr="HEX_STRING" typestr="HEX_STRING"
optional optional
option "private-key" P option "private-key" P
"Terminal's private key." "Terminal's private key"
string string
typestr="FILENAME" typestr="FILENAME"
optional optional
option "cvc-dir" -
"Where to look for the CVCA's certificate"
string
typestr="DIRECTORY"
default="@CVCDIR@"
optional
option "x509-dir" -
"Where to look for the CSCA's certificate"
string
typestr="DIRECTORY"
default="@X509DIR@"
optional
option "disable-ta-checks" - option "disable-ta-checks" -
"Disable checking the validity period of CV certifcates" "Disable checking the validity period of CV certifcates"
flag off flag off

4
npa/test_vicc_with_npa-tool.sh
View File

@@ -49,7 +49,7 @@ for KA in ecdh dh
do do
$VICC --type nPA --ef-cardsecurity=$DATA/$KA/$SECURITY \ $VICC --type nPA --ef-cardsecurity=$DATA/$KA/$SECURITY \
--ef-cardaccess=$DATA/$KA/$ACCESS --ca-key=$DATA/$KA/$NPA_KEY \ --ef-cardaccess=$DATA/$KA/$ACCESS --ca-key=$DATA/$KA/$NPA_KEY \
--cvca=$DATA/$KA/$CVCA --disable-checks & --cvca=$DATA/$KA/$CVCA --disable-ta-checks >/dev/null 2>&1 &
VICC_PID=$! VICC_PID=$!
if test $? -ne 0 if test $? -ne 0
then then
@@ -64,7 +64,7 @@ do
--older-than=19991231 --verify-validity \ --older-than=19991231 --verify-validity \
--read-dg1 --read-dg2 --read-dg3 --read-dg4 --read-dg5 --read-dg6 --read-dg7 --read-dg8 --read-dg9 --read-dg10 --read-dg11 --read-dg12 --read-dg13 --read-dg14 --read-dg15 --read-dg16 --read-dg17 --read-dg18 --read-dg19 --read-dg20 --read-dg21 \ --read-dg1 --read-dg2 --read-dg3 --read-dg4 --read-dg5 --read-dg6 --read-dg7 --read-dg8 --read-dg9 --read-dg10 --read-dg11 --read-dg12 --read-dg13 --read-dg14 --read-dg15 --read-dg16 --read-dg17 --read-dg18 --read-dg19 --read-dg20 --read-dg21 \
--write-dg17=0107 --write-dg18=0108 --write-dg19=0109 --write-dg20=0200 --write-dg21=0201 \ --write-dg17=0107 --write-dg18=0108 --write-dg19=0109 --write-dg20=0200 --write-dg21=0201 \
--disable-ta-check --disable-ca-check --cvc-dir=$DATA/$KA --disable-ta-checks --disable-ca-checks
NPA_RESULT=$? NPA_RESULT=$?
kill $VICC_PID 2>/dev/null kill $VICC_PID 2>/dev/null