added option for cvc and x509 directory

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
 

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)

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