Updated version to 2.1_rc7e.

Added client authentication and packet filtering capability
to management interface.

Extended packet filtering capability to work on both --dev tun
and --dev tap tunnels.

Updated valgrind-suppress file.

Made "Linux ip addr del failed" error nonfatal.

Amplified --client-cert-not-required warning.

Added #pragma pack to proto.h.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@2991 e7ae566f-a301-0410-adde-c780ea21d3b5

1 files changed, 15 insertions, 1 deletions

diff --git a/ssl.h b/ssl.h
index 2f8095f..0b8527d 100644
--- a/ssl.h
+++ b/ssl.h
@@ -375,9 +375,15 @@ struct key_state
 #ifdef ENABLE_DEF_AUTH
   /* If auth_deferred is true, authentication is being deferred */
   bool auth_deferred;
+#ifdef MANAGEMENT_DEF_AUTH
+  unsigned int mda_key_id;
+  unsigned int mda_status;
+#endif
+#ifdef PLUGIN_DEF_AUTH
+  unsigned int auth_control_status;
   time_t acf_last_mod;
   char *auth_control_file;
-  int auth_control_status;
+#endif
 #endif
 };
 
@@ -459,6 +465,10 @@ struct tls_options
   struct env_set *es;
   const struct plugin_list *plugins;
 
+#ifdef MANAGEMENT_DEF_AUTH
+  struct man_def_auth_context *mda_context;
+#endif
+
   /* --gremlin bits */
   int gremlin;
 };
@@ -679,6 +689,10 @@ void tls_lock_common_name (struct tls_multi *multi);
 int tls_authentication_status (struct tls_multi *multi, const int latency);
 void tls_deauthenticate (struct tls_multi *multi);
 
+#ifdef MANAGEMENT_DEF_AUTH
+bool tls_authenticate_key (struct tls_multi *multi, const unsigned int mda_key_id, const bool auth);
+#endif
+
 /*
  * inline functions
  */