Updated through tag hostap_2_5 from git://w1.fi/hostap.git

[mech_eap.git] / libeap / src / eap_peer / eap_tls_common.h

diff --git a/libeap/src/eap_peer/eap_tls_common.h b/libeap/src/eap_peer/eap_tls_common.h
index 53ed1a9..3f7f003 100644 (file)
--- a/libeap/src/eap_peer/eap_tls_common.h
+++ b/libeap/src/eap_peer/eap_tls_common.h
@@ -1,15 +1,9 @@
 /*
  * EAP peer: EAP-TLS/PEAP/TTLS/FAST common functions
- * Copyright (c) 2004-2009, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2009, 2012, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef EAP_TLS_COMMON_H
@@ -70,14 +64,19 @@ struct eap_ssl_data {
        int include_tls_length;
 
        /**
-        * tls_ia - Whether TLS/IA is enabled for this TLS connection
+        * eap - EAP state machine allocated with eap_peer_sm_init()
         */
-       int tls_ia;
+       struct eap_sm *eap;
 
        /**
-        * eap - EAP state machine allocated with eap_peer_sm_init()
+        * ssl_ctx - TLS library context to use for the connection
         */
-       struct eap_sm *eap;
+       void *ssl_ctx;
+
+       /**
+        * eap_type - EAP method used in Phase 1 (EAP_TYPE_TLS/PEAP/TTLS/FAST)
+        */
+       u8 eap_type;
 };
 
 
@@ -90,15 +89,22 @@ struct eap_ssl_data {
  /* could be up to 128 bytes, but only the first 64 bytes are used */
 #define EAP_TLS_KEY_LEN 64
 
+/* dummy type used as a flag for UNAUTH-TLS */
+#define EAP_UNAUTH_TLS_TYPE 255
+#define EAP_WFA_UNAUTH_TLS_TYPE 254
+
 
 int eap_peer_tls_ssl_init(struct eap_sm *sm, struct eap_ssl_data *data,
-                         struct eap_peer_config *config);
+                         struct eap_peer_config *config, u8 eap_type);
 void eap_peer_tls_ssl_deinit(struct eap_sm *sm, struct eap_ssl_data *data);
 u8 * eap_peer_tls_derive_key(struct eap_sm *sm, struct eap_ssl_data *data,
                             const char *label, size_t len);
+u8 * eap_peer_tls_derive_session_id(struct eap_sm *sm,
+                                   struct eap_ssl_data *data, u8 eap_type,
+                                   size_t *len);
 int eap_peer_tls_process_helper(struct eap_sm *sm, struct eap_ssl_data *data,
                                EapType eap_type, int peap_version,
-                               u8 id, const u8 *in_data, size_t in_len,
+                               u8 id, const struct wpabuf *in_data,
                                struct wpabuf **out_data);
 struct wpabuf * eap_peer_tls_build_ack(u8 id, EapType eap_type,
                                       int peap_version);