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

[mech_eap.git] / libeap / src / tls / tlsv1_record.h

diff --git a/libeap/src/tls/tlsv1_record.h b/libeap/src/tls/tlsv1_record.h
index 9c7c0a4..48abcb0 100644 (file)
--- a/libeap/src/tls/tlsv1_record.h
+++ b/libeap/src/tls/tlsv1_record.h
@@ -1,15 +1,9 @@
 /*
  * TLSv1 Record Protocol
- * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2011, 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 TLSV1_RECORD_H
@@ -17,7 +11,7 @@
 
 #include "crypto/crypto.h"
 
-#define TLS_MAX_WRITE_MAC_SECRET_LEN 20
+#define TLS_MAX_WRITE_MAC_SECRET_LEN 32
 #define TLS_MAX_WRITE_KEY_LEN 32
 #define TLS_MAX_IV_LEN 16
 #define TLS_MAX_KEY_BLOCK_LEN (2 * (TLS_MAX_WRITE_MAC_SECRET_LEN + \
@@ -35,6 +29,8 @@ enum {
 };
 
 struct tlsv1_record_layer {
+       u16 tls_version;
+
        u8 write_mac_secret[TLS_MAX_WRITE_MAC_SECRET_LEN];
        u8 read_mac_secret[TLS_MAX_WRITE_MAC_SECRET_LEN];
        u8 write_key[TLS_MAX_WRITE_KEY_LEN];
@@ -66,7 +62,8 @@ int tlsv1_record_set_cipher_suite(struct tlsv1_record_layer *rl,
 int tlsv1_record_change_write_cipher(struct tlsv1_record_layer *rl);
 int tlsv1_record_change_read_cipher(struct tlsv1_record_layer *rl);
 int tlsv1_record_send(struct tlsv1_record_layer *rl, u8 content_type, u8 *buf,
-                     size_t buf_size, size_t payload_len, size_t *out_len);
+                     size_t buf_size, const u8 *payload, size_t payload_len,
+                     size_t *out_len);
 int tlsv1_record_receive(struct tlsv1_record_layer *rl,
                         const u8 *in_data, size_t in_len,
                         u8 *out_data, size_t *out_len, u8 *alert);