Updated through tag hostap_2_5 from git://w1.fi/hostap.git
[mech_eap.git] / libeap / src / tls / tlsv1_server_write.c
index 6d1df7f..15e6692 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * TLSv1 server - write handshake message
- * Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2006-2014, 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.
  */
 
 #include "includes.h"
@@ -17,7 +11,9 @@
 #include "common.h"
 #include "crypto/md5.h"
 #include "crypto/sha1.h"
+#include "crypto/sha256.h"
 #include "crypto/tls.h"
+#include "crypto/random.h"
 #include "x509v3.h"
 #include "tlsv1_common.h"
 #include "tlsv1_record.h"
@@ -52,13 +48,13 @@ static int tls_write_server_hello(struct tlsv1_server *conn,
 
        pos = *msgpos;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send ServerHello");
+       tlsv1_server_log(conn, "Send ServerHello");
        rhdr = pos;
        pos += TLS_RECORD_HEADER_LEN;
 
        os_get_time(&now);
        WPA_PUT_BE32(conn->server_random, now.sec);
-       if (os_get_random(conn->server_random + 4, TLS_RANDOM_LEN - 4)) {
+       if (random_get_bytes(conn->server_random + 4, TLS_RANDOM_LEN - 4)) {
                wpa_printf(MSG_ERROR, "TLSv1: Could not generate "
                           "server_random");
                return -1;
@@ -67,7 +63,7 @@ static int tls_write_server_hello(struct tlsv1_server *conn,
                    conn->server_random, TLS_RANDOM_LEN);
 
        conn->session_id_len = TLS_SESSION_ID_MAX_LEN;
-       if (os_get_random(conn->session_id, conn->session_id_len)) {
+       if (random_get_bytes(conn->session_id, conn->session_id_len)) {
                wpa_printf(MSG_ERROR, "TLSv1: Could not generate "
                           "session_id");
                return -1;
@@ -86,7 +82,7 @@ static int tls_write_server_hello(struct tlsv1_server *conn,
        pos += 3;
        /* body - ServerHello */
        /* ProtocolVersion server_version */
-       WPA_PUT_BE16(pos, TLS_VERSION);
+       WPA_PUT_BE16(pos, conn->rl.tls_version);
        pos += 2;
        /* Random random: uint32 gmt_unix_time, opaque random_bytes */
        os_memcpy(pos, conn->server_random, TLS_RANDOM_LEN);
@@ -108,8 +104,7 @@ static int tls_write_server_hello(struct tlsv1_server *conn,
                        conn->client_random, conn->server_random,
                        conn->master_secret);
                if (res < 0) {
-                       wpa_printf(MSG_DEBUG, "TLSv1: SessionTicket callback "
-                                  "indicated failure");
+                       tlsv1_server_log(conn, "SessionTicket callback indicated failure");
                        tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                           TLS_ALERT_HANDSHAKE_FAILURE);
                        return -1;
@@ -142,7 +137,8 @@ static int tls_write_server_hello(struct tlsv1_server *conn,
        tls_verify_hash_add(&conn->verify, hs_start, pos - hs_start);
 
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             rhdr, end - rhdr, hs_start, pos - hs_start,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to create TLS record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
@@ -173,7 +169,7 @@ static int tls_write_server_certificate(struct tlsv1_server *conn,
 
        pos = *msgpos;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send Certificate");
+       tlsv1_server_log(conn, "Send Certificate");
        rhdr = pos;
        pos += TLS_RECORD_HEADER_LEN;
 
@@ -226,7 +222,8 @@ static int tls_write_server_certificate(struct tlsv1_server *conn,
        WPA_PUT_BE24(hs_length, pos - hs_length - 3);
 
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             rhdr, end - rhdr, hs_start, pos - hs_start,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to generate a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
@@ -247,10 +244,12 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
 {
        tls_key_exchange keyx;
        const struct tls_cipher_suite *suite;
-       u8 *pos, *rhdr, *hs_start, *hs_length;
+       u8 *pos, *rhdr, *hs_start, *hs_length, *server_params;
        size_t rlen;
        u8 *dh_ys;
        size_t dh_ys_len;
+       const u8 *dh_p;
+       size_t dh_p_len;
 
        suite = tls_get_cipher_suite(conn->rl.cipher_suite);
        if (suite == NULL)
@@ -263,8 +262,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                return 0;
        }
 
-       if (keyx != TLS_KEY_X_DH_anon) {
-               /* TODO? */
+       if (keyx != TLS_KEY_X_DH_anon && keyx != TLS_KEY_X_DHE_RSA) {
                wpa_printf(MSG_DEBUG, "TLSv1: ServerKeyExchange not yet "
                           "supported with key exchange type %d", keyx);
                return -1;
@@ -277,8 +275,10 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                return -1;
        }
 
+       tlsv1_server_get_dh_p(conn, &dh_p, &dh_p_len);
+
        os_free(conn->dh_secret);
-       conn->dh_secret_len = conn->cred->dh_p_len;
+       conn->dh_secret_len = dh_p_len;
        conn->dh_secret = os_malloc(conn->dh_secret_len);
        if (conn->dh_secret == NULL) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to allocate "
@@ -287,7 +287,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                                   TLS_ALERT_INTERNAL_ERROR);
                return -1;
        }
-       if (os_get_random(conn->dh_secret, conn->dh_secret_len)) {
+       if (random_get_bytes(conn->dh_secret, conn->dh_secret_len)) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to get random "
                           "data for Diffie-Hellman");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
@@ -297,8 +297,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                return -1;
        }
 
-       if (os_memcmp(conn->dh_secret, conn->cred->dh_p, conn->dh_secret_len) >
-           0)
+       if (os_memcmp(conn->dh_secret, dh_p, conn->dh_secret_len) > 0)
                conn->dh_secret[0] = 0; /* make sure secret < p */
 
        pos = conn->dh_secret;
@@ -313,7 +312,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                        conn->dh_secret, conn->dh_secret_len);
 
        /* Ys = g^secret mod p */
-       dh_ys_len = conn->cred->dh_p_len;
+       dh_ys_len = dh_p_len;
        dh_ys = os_malloc(dh_ys_len);
        if (dh_ys == NULL) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to allocate memory for "
@@ -324,8 +323,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
        }
        if (crypto_mod_exp(conn->cred->dh_g, conn->cred->dh_g_len,
                           conn->dh_secret, conn->dh_secret_len,
-                          conn->cred->dh_p, conn->cred->dh_p_len,
-                          dh_ys, &dh_ys_len)) {
+                          dh_p, dh_p_len, dh_ys, &dh_ys_len)) {
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
                os_free(dh_ys);
@@ -356,7 +354,7 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
 
        pos = *msgpos;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send ServerKeyExchange");
+       tlsv1_server_log(conn, "Send ServerKeyExchange");
        rhdr = pos;
        pos += TLS_RECORD_HEADER_LEN;
 
@@ -371,8 +369,9 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
        pos += 3;
 
        /* body - ServerDHParams */
+       server_params = pos;
        /* dh_p */
-       if (pos + 2 + conn->cred->dh_p_len > end) {
+       if (pos + 2 + dh_p_len > end) {
                wpa_printf(MSG_DEBUG, "TLSv1: Not enough buffer space for "
                           "dh_p");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
@@ -380,10 +379,10 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
                os_free(dh_ys);
                return -1;
        }
-       WPA_PUT_BE16(pos, conn->cred->dh_p_len);
+       WPA_PUT_BE16(pos, dh_p_len);
        pos += 2;
-       os_memcpy(pos, conn->cred->dh_p, conn->cred->dh_p_len);
-       pos += conn->cred->dh_p_len;
+       os_memcpy(pos, dh_p, dh_p_len);
+       pos += dh_p_len;
 
        /* dh_g */
        if (pos + 2 + conn->cred->dh_g_len > end) {
@@ -414,10 +413,143 @@ static int tls_write_server_key_exchange(struct tlsv1_server *conn,
        pos += dh_ys_len;
        os_free(dh_ys);
 
+       /*
+        * select (SignatureAlgorithm)
+        * {   case anonymous: struct { };
+        *     case rsa:
+        *         digitally-signed struct {
+        *             opaque md5_hash[16];
+        *             opaque sha_hash[20];
+        *         };
+        *     case dsa:
+        *         digitally-signed struct {
+        *             opaque sha_hash[20];
+        *         };
+        * } Signature;
+        *
+        * md5_hash
+        *     MD5(ClientHello.random + ServerHello.random + ServerParams);
+        *
+        * sha_hash
+        *     SHA(ClientHello.random + ServerHello.random + ServerParams);
+        */
+
+       if (keyx == TLS_KEY_X_DHE_RSA) {
+               u8 hash[100];
+               u8 *signed_start;
+               size_t clen;
+               int hlen;
+
+               if (conn->rl.tls_version >= TLS_VERSION_1_2) {
+#ifdef CONFIG_TLSV12
+                       hlen = tlsv12_key_x_server_params_hash(
+                               conn->rl.tls_version, conn->client_random,
+                               conn->server_random, server_params,
+                               pos - server_params, hash + 19);
+
+                       /*
+                        * RFC 5246, 4.7:
+                        * TLS v1.2 adds explicit indication of the used
+                        * signature and hash algorithms.
+                        *
+                        * struct {
+                        *   HashAlgorithm hash;
+                        *   SignatureAlgorithm signature;
+                        * } SignatureAndHashAlgorithm;
+                        */
+                       if (hlen < 0 || pos + 2 > end) {
+                               tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
+                                                  TLS_ALERT_INTERNAL_ERROR);
+                               return -1;
+                       }
+                       *pos++ = TLS_HASH_ALG_SHA256;
+                       *pos++ = TLS_SIGN_ALG_RSA;
+
+                       /*
+                        * RFC 3447, A.2.4 RSASSA-PKCS1-v1_5
+                        *
+                        * DigestInfo ::= SEQUENCE {
+                        *   digestAlgorithm DigestAlgorithm,
+                        *   digest OCTET STRING
+                        * }
+                        *
+                        * SHA-256 OID: sha256WithRSAEncryption ::= {pkcs-1 11}
+                        *
+                        * DER encoded DigestInfo for SHA256 per RFC 3447:
+                        * 30 31 30 0d 06 09 60 86 48 01 65 03 04 02 01 05 00
+                        * 04 20 || H
+                        */
+                       hlen += 19;
+                       os_memcpy(hash,
+                                 "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65"
+                                 "\x03\x04\x02\x01\x05\x00\x04\x20", 19);
+
+#else /* CONFIG_TLSV12 */
+                       tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
+                                          TLS_ALERT_INTERNAL_ERROR);
+                       return -1;
+#endif /* CONFIG_TLSV12 */
+               } else {
+                       hlen = tls_key_x_server_params_hash(
+                               conn->rl.tls_version, conn->client_random,
+                               conn->server_random, server_params,
+                               pos - server_params, hash);
+               }
+
+               if (hlen < 0) {
+                       tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
+                                          TLS_ALERT_INTERNAL_ERROR);
+                       return -1;
+               }
+
+               wpa_hexdump(MSG_MSGDUMP, "TLS: ServerKeyExchange signed_params hash",
+                           hash, hlen);
+#ifdef CONFIG_TESTING_OPTIONS
+               if (conn->test_flags & TLS_BREAK_SRV_KEY_X_HASH) {
+                       tlsv1_server_log(conn, "TESTING: Break ServerKeyExchange signed params hash");
+                       hash[hlen - 1] ^= 0x80;
+               }
+#endif /* CONFIG_TESTING_OPTIONS */
+
+               /*
+                * RFC 2246, 4.7:
+                * In digital signing, one-way hash functions are used as input
+                * for a signing algorithm. A digitally-signed element is
+                * encoded as an opaque vector <0..2^16-1>, where the length is
+                * specified by the signing algorithm and key.
+                *
+                * In RSA signing, a 36-byte structure of two hashes (one SHA
+                * and one MD5) is signed (encrypted with the private key). It
+                * is encoded with PKCS #1 block type 0 or type 1 as described
+                * in [PKCS1].
+                */
+               signed_start = pos; /* length to be filled */
+               pos += 2;
+               clen = end - pos;
+               if (conn->cred == NULL ||
+                   crypto_private_key_sign_pkcs1(conn->cred->key, hash, hlen,
+                                                 pos, &clen) < 0) {
+                       wpa_printf(MSG_DEBUG, "TLSv1: Failed to sign hash (PKCS #1)");
+                       tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
+                                          TLS_ALERT_INTERNAL_ERROR);
+                       return -1;
+               }
+               WPA_PUT_BE16(signed_start, clen);
+#ifdef CONFIG_TESTING_OPTIONS
+               if (conn->test_flags & TLS_BREAK_SRV_KEY_X_SIGNATURE) {
+                       tlsv1_server_log(conn, "TESTING: Break ServerKeyExchange signed params signature");
+                       pos[clen - 1] ^= 0x80;
+               }
+#endif /* CONFIG_TESTING_OPTIONS */
+
+               pos += clen;
+       }
+
        WPA_PUT_BE24(hs_length, pos - hs_length - 3);
 
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             rhdr, end - rhdr, hs_start, pos - hs_start,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to generate a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
@@ -446,7 +578,7 @@ static int tls_write_server_certificate_request(struct tlsv1_server *conn,
 
        pos = *msgpos;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send CertificateRequest");
+       tlsv1_server_log(conn, "Send CertificateRequest");
        rhdr = pos;
        pos += TLS_RECORD_HEADER_LEN;
 
@@ -482,7 +614,8 @@ static int tls_write_server_certificate_request(struct tlsv1_server *conn,
        WPA_PUT_BE24(hs_length, pos - hs_length - 3);
 
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             rhdr, end - rhdr, hs_start, pos - hs_start,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to generate a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
@@ -501,40 +634,35 @@ static int tls_write_server_certificate_request(struct tlsv1_server *conn,
 static int tls_write_server_hello_done(struct tlsv1_server *conn,
                                       u8 **msgpos, u8 *end)
 {
-       u8 *pos, *rhdr, *hs_start, *hs_length;
+       u8 *pos;
        size_t rlen;
+       u8 payload[4];
 
-       pos = *msgpos;
-
-       wpa_printf(MSG_DEBUG, "TLSv1: Send ServerHelloDone");
-       rhdr = pos;
-       pos += TLS_RECORD_HEADER_LEN;
+       tlsv1_server_log(conn, "Send ServerHelloDone");
 
        /* opaque fragment[TLSPlaintext.length] */
 
        /* Handshake */
-       hs_start = pos;
+       pos = payload;
        /* HandshakeType msg_type */
        *pos++ = TLS_HANDSHAKE_TYPE_SERVER_HELLO_DONE;
-       /* uint24 length (to be filled) */
-       hs_length = pos;
+       /* uint24 length */
+       WPA_PUT_BE24(pos, 0);
        pos += 3;
        /* body - ServerHelloDone (empty) */
 
-       WPA_PUT_BE24(hs_length, pos - hs_length - 3);
-
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             *msgpos, end - *msgpos, payload, pos - payload,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to generate a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
                return -1;
        }
-       pos = rhdr + rlen;
 
-       tls_verify_hash_add(&conn->verify, hs_start, pos - hs_start);
+       tls_verify_hash_add(&conn->verify, payload, pos - payload);
 
-       *msgpos = pos;
+       *msgpos += rlen;
 
        return 0;
 }
@@ -543,17 +671,16 @@ static int tls_write_server_hello_done(struct tlsv1_server *conn,
 static int tls_write_server_change_cipher_spec(struct tlsv1_server *conn,
                                               u8 **msgpos, u8 *end)
 {
-       u8 *pos, *rhdr;
        size_t rlen;
+       u8 payload[1];
 
-       pos = *msgpos;
+       tlsv1_server_log(conn, "Send ChangeCipherSpec");
+
+       payload[0] = TLS_CHANGE_CIPHER_SPEC;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send ChangeCipherSpec");
-       rhdr = pos;
-       pos += TLS_RECORD_HEADER_LEN;
-       *pos = TLS_CHANGE_CIPHER_SPEC;
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_CHANGE_CIPHER_SPEC,
-                             rhdr, end - rhdr, 1, &rlen) < 0) {
+                             *msgpos, end - *msgpos, payload, sizeof(payload),
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to create a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
@@ -568,7 +695,7 @@ static int tls_write_server_change_cipher_spec(struct tlsv1_server *conn,
                return -1;
        }
 
-       *msgpos = rhdr + rlen;
+       *msgpos += rlen;
 
        return 0;
 }
@@ -577,17 +704,32 @@ static int tls_write_server_change_cipher_spec(struct tlsv1_server *conn,
 static int tls_write_server_finished(struct tlsv1_server *conn,
                                     u8 **msgpos, u8 *end)
 {
-       u8 *pos, *rhdr, *hs_start, *hs_length;
+       u8 *pos, *hs_start;
        size_t rlen, hlen;
-       u8 verify_data[TLS_VERIFY_DATA_LEN];
+       u8 verify_data[1 + 3 + TLS_VERIFY_DATA_LEN];
        u8 hash[MD5_MAC_LEN + SHA1_MAC_LEN];
 
        pos = *msgpos;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send Finished");
+       tlsv1_server_log(conn, "Send Finished");
 
        /* Encrypted Handshake Message: Finished */
 
+#ifdef CONFIG_TLSV12
+       if (conn->rl.tls_version >= TLS_VERSION_1_2) {
+               hlen = SHA256_MAC_LEN;
+               if (conn->verify.sha256_server == NULL ||
+                   crypto_hash_finish(conn->verify.sha256_server, hash, &hlen)
+                   < 0) {
+                       conn->verify.sha256_server = NULL;
+                       tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
+                                          TLS_ALERT_INTERNAL_ERROR);
+                       return -1;
+               }
+               conn->verify.sha256_server = NULL;
+       } else {
+#endif /* CONFIG_TLSV12 */
+
        hlen = MD5_MAC_LEN;
        if (conn->verify.md5_server == NULL ||
            crypto_hash_finish(conn->verify.md5_server, hash, &hlen) < 0) {
@@ -609,43 +751,50 @@ static int tls_write_server_finished(struct tlsv1_server *conn,
                return -1;
        }
        conn->verify.sha1_server = NULL;
+       hlen = MD5_MAC_LEN + SHA1_MAC_LEN;
 
-       if (tls_prf(conn->master_secret, TLS_MASTER_SECRET_LEN,
-                   "server finished", hash, MD5_MAC_LEN + SHA1_MAC_LEN,
-                   verify_data, TLS_VERIFY_DATA_LEN)) {
+#ifdef CONFIG_TLSV12
+       }
+#endif /* CONFIG_TLSV12 */
+
+       if (tls_prf(conn->rl.tls_version,
+                   conn->master_secret, TLS_MASTER_SECRET_LEN,
+                   "server finished", hash, hlen,
+                   verify_data + 1 + 3, TLS_VERIFY_DATA_LEN)) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to generate verify_data");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
                return -1;
        }
        wpa_hexdump_key(MSG_DEBUG, "TLSv1: verify_data (server)",
-                       verify_data, TLS_VERIFY_DATA_LEN);
+                       verify_data + 1 + 3, TLS_VERIFY_DATA_LEN);
+#ifdef CONFIG_TESTING_OPTIONS
+       if (conn->test_flags & TLS_BREAK_VERIFY_DATA) {
+               tlsv1_server_log(conn, "TESTING: Break verify_data (server)");
+               verify_data[1 + 3 + 1] ^= 0x80;
+       }
+#endif /* CONFIG_TESTING_OPTIONS */
 
-       rhdr = pos;
-       pos += TLS_RECORD_HEADER_LEN;
        /* Handshake */
-       hs_start = pos;
+       pos = hs_start = verify_data;
        /* HandshakeType msg_type */
        *pos++ = TLS_HANDSHAKE_TYPE_FINISHED;
-       /* uint24 length (to be filled) */
-       hs_length = pos;
+       /* uint24 length */
+       WPA_PUT_BE24(pos, TLS_VERIFY_DATA_LEN);
        pos += 3;
-       os_memcpy(pos, verify_data, TLS_VERIFY_DATA_LEN);
        pos += TLS_VERIFY_DATA_LEN;
-       WPA_PUT_BE24(hs_length, pos - hs_length - 3);
        tls_verify_hash_add(&conn->verify, hs_start, pos - hs_start);
 
        if (tlsv1_record_send(&conn->rl, TLS_CONTENT_TYPE_HANDSHAKE,
-                             rhdr, end - rhdr, pos - hs_start, &rlen) < 0) {
+                             *msgpos, end - *msgpos, hs_start, pos - hs_start,
+                             &rlen) < 0) {
                wpa_printf(MSG_DEBUG, "TLSv1: Failed to create a record");
                tlsv1_server_alert(conn, TLS_ALERT_LEVEL_FATAL,
                                   TLS_ALERT_INTERNAL_ERROR);
                return -1;
        }
 
-       pos = rhdr + rlen;
-
-       *msgpos = pos;
+       *msgpos += rlen;
 
        return 0;
 }
@@ -726,7 +875,7 @@ static u8 * tls_send_change_cipher_spec(struct tlsv1_server *conn,
 
        *out_len = pos - msg;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Handshake completed successfully");
+       tlsv1_server_log(conn, "Handshake completed successfully");
        conn->state = ESTABLISHED;
 
        return msg;
@@ -745,8 +894,8 @@ u8 * tlsv1_server_handshake_write(struct tlsv1_server *conn, size_t *out_len)
                        /* Abbreviated handshake was already completed. */
                        return NULL;
                }
-               wpa_printf(MSG_DEBUG, "TLSv1: Unexpected state %d while "
-                          "generating reply", conn->state);
+               tlsv1_server_log(conn, "Unexpected state %d while generating reply",
+                                conn->state);
                return NULL;
        }
 }
@@ -757,7 +906,7 @@ u8 * tlsv1_server_send_alert(struct tlsv1_server *conn, u8 level,
 {
        u8 *alert, *pos, *length;
 
-       wpa_printf(MSG_DEBUG, "TLSv1: Send Alert(%d:%d)", level, description);
+       tlsv1_server_log(conn, "Send Alert(%d:%d)", level, description);
        *out_len = 0;
 
        alert = os_malloc(10);
@@ -770,7 +919,8 @@ u8 * tlsv1_server_send_alert(struct tlsv1_server *conn, u8 level,
        /* ContentType type */
        *pos++ = TLS_CONTENT_TYPE_ALERT;
        /* ProtocolVersion version */
-       WPA_PUT_BE16(pos, TLS_VERSION);
+       WPA_PUT_BE16(pos, conn->rl.tls_version ? conn->rl.tls_version :
+                    TLS_VERSION);
        pos += 2;
        /* uint16 length (to be filled) */
        length = pos;