}
}
- if (!PACKET_get_net_2(pkt, &clienthello.version)) {
+ if (!PACKET_get_net_2(pkt, &clienthello.legacy_version)) {
al = SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, SSL_R_LENGTH_TOO_SHORT);
goto err;
/*
* Handle an SSLv2 backwards compatible ClientHello
* Note, this is only for SSLv3+ using the backward compatible format.
- * Real SSLv2 is not supported, and is rejected above.
+ * Real SSLv2 is not supported, and is rejected below.
*/
unsigned int ciphersuite_len, session_id_len, challenge_len;
PACKET challenge;
al = SSL_AD_DECODE_ERROR;
goto f_err;
}
- clienthello.session_id_len = session_id_len;
if (session_id_len > SSL_MAX_SSL_SESSION_ID_LENGTH) {
al = SSL_AD_DECODE_ERROR;
if (!PACKET_get_sub_packet(pkt, &clienthello.ciphersuites,
ciphersuite_len)
- || !PACKET_get_sub_packet(pkt, &session_id,
- clienthello.session_id_len)
+ || !PACKET_copy_bytes(pkt, clienthello.session_id, session_id_len)
|| !PACKET_get_sub_packet(pkt, &challenge, challenge_len)
/* No extensions. */
|| PACKET_remaining(pkt) != 0) {
al = SSL_AD_DECODE_ERROR;
goto f_err;
}
+ clienthello.session_id_len = session_id_len;
- /* Load the client random and compression list. */
- challenge_len = challenge_len > sizeof(clienthello.random)
- ? sizeof(clienthello.random) : challenge_len;
- memset(clienthello.random, 0, sizeof(clienthello.random));
+ /* Load the client random and compression list. We use SSL3_RANDOM_SIZE
+ * here rather than sizeof(clienthello.random) because that is the limit
+ * for SSLv3 and it is fixed. It won't change even if
+ * sizeof(clienthello.random) does.
+ */
+ challenge_len = challenge_len > SSL3_RANDOM_SIZE
+ ? SSL3_RANDOM_SIZE : challenge_len;
+ memset(clienthello.random, 0, SSL3_RANDOM_SIZE);
if (!PACKET_copy_bytes(&challenge,
- clienthello.random + sizeof(clienthello.random) -
+ clienthello.random + SSL3_RANDOM_SIZE -
challenge_len, challenge_len)
/* Advertise only null compression. */
|| !PACKET_buf_init(&compression, &null_compression, 1)) {
} else {
/* Regular ClientHello. */
if (!PACKET_copy_bytes(pkt, clienthello.random, SSL3_RANDOM_SIZE)
- || !PACKET_get_length_prefixed_1(pkt, &session_id)) {
+ || !PACKET_get_length_prefixed_1(pkt, &session_id)
+ || !PACKET_copy_all(&session_id, clienthello.session_id,
+ SSL_MAX_SSL_SESSION_ID_LENGTH,
+ &clienthello.session_id_len)) {
al = SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
goto f_err;
}
if (!PACKET_copy_all(&compression, clienthello.compressions,
- MAX_COMPRESSIONS_SIZE, &clienthello.compressions_len)
- || !PACKET_copy_all(&session_id, clienthello.session_id,
- SSL_MAX_SSL_SESSION_ID_LENGTH,
- &clienthello.session_id_len)) {
+ MAX_COMPRESSIONS_SIZE,
+ &clienthello.compressions_len)) {
al = SSL_AD_DECODE_ERROR;
SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, SSL_R_LENGTH_MISMATCH);
goto f_err;
/* Choose the version */
if (clienthello.isv2) {
- if (clienthello.version == SSL2_VERSION
- || (clienthello.version & 0xff00)
+ if (clienthello.legacy_version == SSL2_VERSION
+ || (clienthello.legacy_version & 0xff00)
!= (SSL3_VERSION_MAJOR << 8)) {
/*
* This is real SSLv2 or something complete unknown. We don't
goto err;
}
/* SSLv3/TLS */
- s->client_version = clienthello.version;
+ s->client_version = clienthello.legacy_version;
}
/*
* Do SSL/TLS version negotiation if applicable. For DTLS we just check
if (!SSL_IS_DTLS(s)) {
protverr = ssl_choose_server_version(s, &clienthello);
} else if (s->method->version != DTLS_ANY_VERSION &&
- DTLS_VERSION_LT((int)clienthello.version, s->version)) {
+ DTLS_VERSION_LT((int)clienthello.legacy_version, s->version)) {
protverr = SSL_R_VERSION_TOO_LOW;
} else {
protverr = 0;
SSLerr(SSL_F_TLS_PROCESS_CLIENT_HELLO, protverr);
if ((!s->enc_write_ctx && !s->write_hash)) {
/* like ssl3_get_record, send alert using remote version number */
- s->version = s->client_version = clienthello.version;
+ s->version = s->client_version = clienthello.legacy_version;
}
al = SSL_AD_PROTOCOL_VERSION;
goto f_err;
sk_SSL_CIPHER_free(ciphers);
OPENSSL_free(clienthello.pre_proc_exts);
- return MSG_PROCESS_ERROR;
+ return MSG_PROCESS_ERROR;
}
WORK_STATE tls_post_process_client_hello(SSL *s, WORK_STATE wst)