commit dc9003c290a5883d64d640580a946be7ca11b68e
author Ken Mixter <kmixter@chromium.org> Sat May 07 01:02:14 2011
committer Ken Mixter <kmixter@chromium.org> Thu May 12 20:08:50 2011
tree 041cd353cab0052c7c5849a99750d5536aabb9ea
parent 4809f61a6835f95c0e70c5d138a2a38d56542b1c

vpn-manager: Change names of parameters to be more exact (PKCS#11 vs TPM)

BUG=chromium-os:12695
TEST=connect-vpn

Change-Id: I181762267cf89863d2095e9c794a958862180c86
Reviewed-on: http://gerrit.chromium.org/gerrit/485
Tested-by: Ken Mixter <kmixter@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>

l2tpipsec_vpn.cc

diff --git a/l2tpipsec_vpn.cc b/l2tpipsec_vpn.cc
index 54c362f..c295267 100644
--- a/l2tpipsec_vpn.cc
+++ b/l2tpipsec_vpn.cc
@@ -19,8 +19,8 @@
 #include "vpn-manager/l2tp_manager.h"
 
 #pragma GCC diagnostic ignored "-Wstrict-aliasing"
-DEFINE_string(client_cert_tpm_id, "", "TPM slot with client certificate");
-DEFINE_string(client_cert_tpm_slot, "", "TPM key ID for client certificate");
+DEFINE_string(client_cert_id, "", "PKCS#11 slot with client certificate");
+DEFINE_string(client_cert_slot, "", "PKCS#11 key ID for client certificate");
 DEFINE_string(psk_file, "", "File with IPsec pre-shared key");
 DEFINE_string(remote_host, "", "VPN server hostname");
 DEFINE_string(server_ca_file, "", "File with IPsec server CA in DER format");
@@ -117,8 +117,8 @@
                         FLAGS_psk_file,
                         FLAGS_server_ca_file,
                         FLAGS_server_id,
-                        FLAGS_client_cert_tpm_slot,
-                        FLAGS_client_cert_tpm_id,
+                        FLAGS_client_cert_slot,
+                        FLAGS_client_cert_id,
                         FLAGS_tpm_user_pin)) {
     return 1;
   }