Redesigned EAP-TLS/PEAP/TTLS/FAST fragmentation/reassembly

[libeap.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 2470faa..4d89f77 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-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2004-2008, 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
@@ -18,18 +18,17 @@
 struct eap_ssl_data {
        struct tls_connection *conn;
 
-       u8 *tls_out;
-       size_t tls_out_len;
-       size_t tls_out_pos;
        size_t tls_out_limit;
-       u8 *tls_in;
-       size_t tls_in_len;
-       size_t tls_in_left;
-       size_t tls_in_total;
 
        int phase2;
 
        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;
 };
 
 
@@ -48,16 +47,17 @@ int eap_server_tls_ssl_init(struct eap_sm *sm, struct eap_ssl_data *data,
 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);
-int eap_server_tls_data_reassemble(struct eap_sm *sm,
-                                  struct eap_ssl_data *data,
-                                  u8 **in_data, size_t *in_len);
-int eap_server_tls_process_helper(struct eap_sm *sm, struct eap_ssl_data *data,
-                                 const u8 *in_data, size_t in_len);
-int eap_server_tls_buildReq_helper(struct eap_sm *sm,
-                                  struct eap_ssl_data *data,
-                                  int eap_type, int peap_version, u8 id,
-                                  struct wpabuf **out_data);
+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_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);
 
 #endif /* EAP_TLS_COMMON_H */