From 233816656a40891fca6bb122901bc7f152b31941 Mon Sep 17 00:00:00 2001
From: Frank Morgner <morgner@informatik.hu-berlin.de>
Date: Mon, 25 Feb 2013 23:56:22 +0100
Subject: [PATCH] added option for cvc and x509 directory

---
 npa/src/Makefile.am            |  6 ++++--
 npa/src/npa-tool.c             |  4 ++++
 npa/src/npa-tool.ggo.in        | 14 +++++++++++++-
 npa/test_vicc_with_npa-tool.sh |  4 ++--
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/npa/src/Makefile.am b/npa/src/Makefile.am
index c2c4b67..29cd27e 100644
--- a/npa/src/Makefile.am
+++ b/npa/src/Makefile.am
@@ -1,10 +1,12 @@
 do_subst = $(SED) \
+	   -e 's,[@]CVCDIR[@],$(CVCDIR),g' \
 	   -e 's,[@]PACKAGE[@],$(PACKAGE),g' \
+	   -e 's,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g' \
 	   -e 's,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),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_VERSION[@],$(PACKAGE_VERSION),g'
+	   -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' \
+	   -e 's,[@]X509DIR[@],$(X509DIR),g'
 
 BUILT_SOURCES = cmdline.h cmdline.c
 
diff --git a/npa/src/npa-tool.c b/npa/src/npa-tool.c
index bede7fa..f0b128d 100644
--- a/npa/src/npa-tool.c
+++ b/npa/src/npa-tool.c
@@ -348,6 +348,10 @@ main (int argc, char **argv)
         npa_default_flags |= NPA_FLAG_DISABLE_CHECK_TA;
     if (cmdline.disable_ca_checks_flag)
         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)
diff --git a/npa/src/npa-tool.ggo.in b/npa/src/npa-tool.ggo.in
index 34195a4..5980e52 100644
--- a/npa/src/npa-tool.ggo.in
+++ b/npa/src/npa-tool.ggo.in
@@ -74,10 +74,22 @@ option "auxiliary-data" A
     typestr="HEX_STRING"
     optional
 option "private-key"    P
-    "Terminal's private key."
+    "Terminal's private key"
     string
     typestr="FILENAME"
     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"   -
     "Disable checking the validity period of CV certifcates"
     flag off
diff --git a/npa/test_vicc_with_npa-tool.sh b/npa/test_vicc_with_npa-tool.sh
index 490d8fe..594d3ad 100755
--- a/npa/test_vicc_with_npa-tool.sh
+++ b/npa/test_vicc_with_npa-tool.sh
@@ -49,7 +49,7 @@ for KA in ecdh dh
 do
     $VICC --type nPA --ef-cardsecurity=$DATA/$KA/$SECURITY \
         --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=$!
     if test $? -ne 0
     then
@@ -64,7 +64,7 @@ do
         --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 \
         --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=$?
 
     kill $VICC_PID 2>/dev/null