automake build system

[mech_eap.git] / src / eap_server / eap_tls_common.h

diff --git a/src/eap_server/eap_tls_common.h b/src/eap_server/eap_tls_common.h
index 4d89f77..c34c401 100644 (file)
--- a/src/eap_server/eap_tls_common.h
+++ b/src/eap_server/eap_tls_common.h
@@ -1,6 +1,6 @@
 /*
- * hostapd / EAP-TLS/PEAP/TTLS/FAST common functions
- * Copyright (c) 2004-2008, Jouni Malinen <j@w1.fi>
+ * EAP-TLS/PEAP/TTLS/FAST server common functions
+ * Copyright (c) 2004-2009, 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
@@ -15,19 +15,46 @@
 #ifndef EAP_TLS_COMMON_H
 #define EAP_TLS_COMMON_H
 
+/**
+ * struct eap_ssl_data - TLS data for EAP methods
+ */
 struct eap_ssl_data {
+       /**
+        * conn - TLS connection context data from tls_connection_init()
+        */
        struct tls_connection *conn;
 
+       /**
+        * tls_out - TLS message to be sent out in fragments
+        */
+       struct wpabuf *tls_out;
+
+       /**
+        * tls_out_pos - The current position in the outgoing TLS message
+        */
+       size_t tls_out_pos;
+
+       /**
+        * tls_out_limit - Maximum fragment size for outgoing TLS messages
+        */
        size_t tls_out_limit;
 
+       /**
+        * tls_in - Received TLS message buffer for re-assembly
+        */
+       struct wpabuf *tls_in;
+
+       /**
+        * phase2 - Whether this TLS connection is used in EAP phase 2 (tunnel)
+        */
        int phase2;
 
+       /**
+        * eap - EAP state machine allocated with eap_server_sm_init()
+        */
        struct eap_sm *eap;
 
        enum { MSG, FRAG_ACK, WAIT_FRAG_ACK } state;
-       struct wpabuf *in_buf;
-       struct wpabuf *out_buf;
-       size_t out_used;
        struct wpabuf tmpbuf;
 };
 
@@ -36,7 +63,7 @@ struct eap_ssl_data {
 #define EAP_TLS_FLAGS_LENGTH_INCLUDED 0x80
 #define EAP_TLS_FLAGS_MORE_FRAGMENTS 0x40
 #define EAP_TLS_FLAGS_START 0x20
-#define EAP_PEAP_VERSION_MASK 0x07
+#define EAP_TLS_VERSION_MASK 0x07
 
  /* could be up to 128 bytes, but only the first 64 bytes are used */
 #define EAP_TLS_KEY_LEN 64
@@ -48,16 +75,17 @@ void eap_server_tls_ssl_deinit(struct eap_sm *sm, struct eap_ssl_data *data);
 u8 * eap_server_tls_derive_key(struct eap_sm *sm, struct eap_ssl_data *data,
                               char *label, size_t len);
 struct wpabuf * eap_server_tls_build_msg(struct eap_ssl_data *data,
-                                        int eap_type, int peap_version,
-                                        u8 id);
-struct wpabuf * eap_server_tls_build_ack(u8 id, int eap_type,
-                                        int peap_version);
+                                        int eap_type, int version, u8 id);
+struct wpabuf * eap_server_tls_build_ack(u8 id, int eap_type, int version);
 int eap_server_tls_phase1(struct eap_sm *sm, struct eap_ssl_data *data);
-int eap_server_tls_reassemble(struct eap_ssl_data *data, u8 flags,
-                             const u8 **pos, size_t *left);
-void eap_server_tls_free_in_buf(struct eap_ssl_data *data);
 struct wpabuf * eap_server_tls_encrypt(struct eap_sm *sm,
                                       struct eap_ssl_data *data,
-                                      const u8 *plain, size_t plain_len);
+                                      const struct wpabuf *plain);
+int eap_server_tls_process(struct eap_sm *sm, struct eap_ssl_data *data,
+                          struct wpabuf *respData, void *priv, int eap_type,
+                          int (*proc_version)(struct eap_sm *sm, void *priv,
+                                              int peer_version),
+                          void (*proc_msg)(struct eap_sm *sm, void *priv,
+                                           const struct wpabuf *respData));
 
 #endif /* EAP_TLS_COMMON_H */