commit e0d5dd1ef481599ece78f8ff4a84485eb1134b85
author Darin Petkov <petkov@chromium.org> Wed Apr 04 16:10:48 2012 +0200
committer Gerrit <chrome-bot@google.com> Wed Apr 04 10:09:27 2012 -0700
tree 3d12f20493c2cab37ea15016ae75f07a09374e37
parent c7073307211b6b5a090a14b951524ac210ab1c9c

shill: vpn: Add PKCS#11 to OpenVPN.

This includes both setting up relevant openvpn options and passing a TPM token /
pin through the management interface. Also, refactor a bit the InitOptions code
to ease testing and readability and some OpenVPNDriver unit test cleanup.

BUG=chromium-os:28948
TEST=unit tests

Change-Id: Iff65d9b4ae29defdf02f1da4ebb4845d1050e144
Reviewed-on: https://gerrit.chromium.org/gerrit/19587
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

openvpn_management_server.h

diff --git a/openvpn_management_server.h b/openvpn_management_server.h
index 42a2734..b4cd33f 100644
--- a/openvpn_management_server.h
+++ b/openvpn_management_server.h
@@ -40,11 +40,14 @@
   FRIEND_TEST(OpenVPNManagementServerTest, OnInput);
   FRIEND_TEST(OpenVPNManagementServerTest, OnReady);
   FRIEND_TEST(OpenVPNManagementServerTest, OnReadyAcceptFail);
+  FRIEND_TEST(OpenVPNManagementServerTest, ParseNeedPasswordTag);
   FRIEND_TEST(OpenVPNManagementServerTest, PerformStaticChallenge);
   FRIEND_TEST(OpenVPNManagementServerTest, PerformStaticChallengeNoCreds);
   FRIEND_TEST(OpenVPNManagementServerTest, ProcessInfoMessage);
   FRIEND_TEST(OpenVPNManagementServerTest, ProcessMessage);
   FRIEND_TEST(OpenVPNManagementServerTest, ProcessNeedPasswordMessageAuthSC);
+  FRIEND_TEST(OpenVPNManagementServerTest, ProcessNeedPasswordMessageTPMToken);
+  FRIEND_TEST(OpenVPNManagementServerTest, ProcessNeedPasswordMessageUnknown);
   FRIEND_TEST(OpenVPNManagementServerTest, ProcessStateMessage);
   FRIEND_TEST(OpenVPNManagementServerTest, Send);
   FRIEND_TEST(OpenVPNManagementServerTest, SendPassword);
@@ -52,6 +55,8 @@
   FRIEND_TEST(OpenVPNManagementServerTest, SendUsername);
   FRIEND_TEST(OpenVPNManagementServerTest, Start);
   FRIEND_TEST(OpenVPNManagementServerTest, Stop);
+  FRIEND_TEST(OpenVPNManagementServerTest, SupplyTPMToken);
+  FRIEND_TEST(OpenVPNManagementServerTest, SupplyTPMTokenNoPIN);
 
   // IO handler callbacks.
   void OnReady(int fd);
@@ -68,7 +73,10 @@
   bool ProcessFailedPasswordMessage(const std::string &message);
   bool ProcessStateMessage(const std::string &message);
 
-  void PerformStaticChallenge();
+  void PerformStaticChallenge(const std::string &tag);
+  void SupplyTPMToken(const std::string &tag);
+
+  static std::string ParseNeedPasswordTag(const std::string &message);
 
   OpenVPNDriver *driver_;
   GLib *glib_;