generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add more error state transitions

Browse Source 
Ensure all fatal errors transition into the new error state on the server
side.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit cf9b0b6fb253fd40225d7c648a08646686e62d2d)

Conflicts:
	ssl/s3_srvr.c
This commit is contained in:
Matt Caswell 2015-04-30 11:11:04 +01:00
parent e4f77bf183
commit eecc697b65
1 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
ssl/s3_srvr.c
View File

@ -266,6 +266,7 @@ int ssl3_accept(SSL *s)
if ((s->version >> 8) != 3) { if ((s->version >> 8) != 3) {
SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
s->type = SSL_ST_ACCEPT; s->type = SSL_ST_ACCEPT;
@ -273,11 +274,13 @@ int ssl3_accept(SSL *s)
if (s->init_buf == NULL) { if (s->init_buf == NULL) {
if ((buf = BUF_MEM_new()) == NULL) { if ((buf = BUF_MEM_new()) == NULL) {
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) { if (!BUF_MEM_grow(buf, SSL3_RT_MAX_PLAIN_LENGTH)) {
BUF_MEM_free(buf); BUF_MEM_free(buf);
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
s->init_buf = buf; s->init_buf = buf;
@ -285,6 +288,7 @@ int ssl3_accept(SSL *s)
if (!ssl3_setup_buffers(s)) { if (!ssl3_setup_buffers(s)) {
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
@ -303,6 +307,7 @@ int ssl3_accept(SSL *s)
*/ */
if (!ssl_init_wbio_buffer(s, 1)) { if (!ssl_init_wbio_buffer(s, 1)) {
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
@ -320,6 +325,7 @@ int ssl3_accept(SSL *s)
SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED); SSL_R_UNSAFE_LEGACY_RENEGOTIATION_DISABLED);
ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE); ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE);
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} else { } else {
/* /*
@ -379,6 +385,7 @@ int ssl3_accept(SSL *s)
SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT); SSLerr(SSL_F_SSL3_ACCEPT, SSL_R_CLIENTHELLO_TLSEXT);
ret = SSL_TLSEXT_ERR_ALERT_FATAL; ret = SSL_TLSEXT_ERR_ALERT_FATAL;
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
} }
@ -529,9 +536,12 @@ int ssl3_accept(SSL *s)
skip = 1; skip = 1;
s->s3->tmp.cert_request = 0; s->s3->tmp.cert_request = 0;
s->state = SSL3_ST_SW_SRVR_DONE_A; s->state = SSL3_ST_SW_SRVR_DONE_A;
if (s->s3->handshake_buffer) if (s->s3->handshake_buffer) {
if (!ssl3_digest_cached_records(s)) if (!ssl3_digest_cached_records(s)) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
}
} else { } else {
s->s3->tmp.cert_request = 1; s->s3->tmp.cert_request = 1;
ret = ssl3_send_certificate_request(s); ret = ssl3_send_certificate_request(s);
@ -621,11 +631,14 @@ int ssl3_accept(SSL *s)
*/ */
if (!s->s3->handshake_buffer) { if (!s->s3->handshake_buffer) {
SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_ACCEPT, ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE; s->s3->flags |= TLS1_FLAGS_KEEP_HANDSHAKE;
if (!ssl3_digest_cached_records(s)) if (!ssl3_digest_cached_records(s)) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
} else { } else {
int offset = 0; int offset = 0;
int dgst_num; int dgst_num;
@ -639,9 +652,12 @@ int ssl3_accept(SSL *s)
* CertificateVerify should be generalized. But it is next * CertificateVerify should be generalized. But it is next
* step * step
*/ */
if (s->s3->handshake_buffer) if (s->s3->handshake_buffer) {
if (!ssl3_digest_cached_records(s)) if (!ssl3_digest_cached_records(s)) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
}
for (dgst_num = 0; dgst_num < SSL_MAX_DIGEST; dgst_num++) for (dgst_num = 0; dgst_num < SSL_MAX_DIGEST; dgst_num++)
if (s->s3->handshake_dgst[dgst_num]) { if (s->s3->handshake_dgst[dgst_num]) {
int dgst_size; int dgst_size;
@ -657,6 +673,7 @@ int ssl3_accept(SSL *s)
dgst_size = dgst_size =
EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]); EVP_MD_CTX_size(s->s3->handshake_dgst[dgst_num]);
if (dgst_size < 0) { if (dgst_size < 0) {
s->state = SSL_ST_ERR;
ret = -1; ret = -1;
goto end; goto end;
} }
@ -771,6 +788,7 @@ int ssl3_accept(SSL *s)
s->session->cipher = s->s3->tmp.new_cipher; s->session->cipher = s->s3->tmp.new_cipher;
if (!s->method->ssl3_enc->setup_key_block(s)) { if (!s->method->ssl3_enc->setup_key_block(s)) {
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
@ -787,6 +805,7 @@ int ssl3_accept(SSL *s)
SSL3_CHANGE_CIPHER_SERVER_WRITE)) SSL3_CHANGE_CIPHER_SERVER_WRITE))
{ {
ret = -1; ret = -1;
s->state = SSL_ST_ERR;
goto end; goto end;
} }
@ -1485,8 +1504,10 @@ int ssl3_send_server_hello(SSL *s)
buf = (unsigned char *)s->init_buf->data; buf = (unsigned char *)s->init_buf->data;
#ifdef OPENSSL_NO_TLSEXT #ifdef OPENSSL_NO_TLSEXT
p = s->s3->server_random; p = s->s3->server_random;
if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0) if (ssl_fill_hello_random(s, 1, p, SSL3_RANDOM_SIZE) <= 0) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
#endif #endif
/* Do the message type and length last */ /* Do the message type and length last */
d = p = ssl_handshake_start(s); d = p = ssl_handshake_start(s);
@ -1521,6 +1542,7 @@ int ssl3_send_server_hello(SSL *s)
sl = s->session->session_id_length; sl = s->session->session_id_length;
if (sl > (int)sizeof(s->session->session_id)) { if (sl > (int)sizeof(s->session->session_id)) {
SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
*(p++) = sl; *(p++) = sl;
@ -1543,6 +1565,7 @@ int ssl3_send_server_hello(SSL *s)
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
if (ssl_prepare_serverhello_tlsext(s) <= 0) { if (ssl_prepare_serverhello_tlsext(s) <= 0) {
SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT); SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, SSL_R_SERVERHELLO_TLSEXT);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
if ((p = if ((p =
@ -1550,6 +1573,7 @@ int ssl3_send_server_hello(SSL *s)
&al)) == NULL) { &al)) == NULL) {
ssl3_send_alert(s, SSL3_AL_FATAL, al); ssl3_send_alert(s, SSL3_AL_FATAL, al);
SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_SEND_SERVER_HELLO, ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
#endif #endif
@ -2012,6 +2036,7 @@ int ssl3_send_server_key_exchange(SSL *s)
BN_CTX_free(bn_ctx); BN_CTX_free(bn_ctx);
#endif #endif
EVP_MD_CTX_cleanup(&md_ctx); EVP_MD_CTX_cleanup(&md_ctx);
s->state = SSL_ST_ERR;
return (-1); return (-1);
} }
@ -2105,6 +2130,7 @@ int ssl3_send_certificate_request(SSL *s)
/* SSL3_ST_SW_CERT_REQ_B */ /* SSL3_ST_SW_CERT_REQ_B */
return ssl_do_write(s); return ssl_do_write(s);
err: err:
s->state = SSL_ST_ERR;
return (-1); return (-1);
} }
@ -2909,6 +2935,7 @@ int ssl3_get_client_key_exchange(SSL *s)
EC_KEY_free(srvr_ecdh); EC_KEY_free(srvr_ecdh);
BN_CTX_free(bn_ctx); BN_CTX_free(bn_ctx);
#endif #endif
s->state = SSL_ST_ERR;
return (-1); return (-1);
} }
@ -3111,6 +3138,7 @@ int ssl3_get_cert_verify(SSL *s)
if (0) { if (0) {
f_err: f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al); ssl3_send_alert(s, SSL3_AL_FATAL, al);
s->state = SSL_ST_ERR;
} }
end: end:
if (s->s3->handshake_buffer) { if (s->s3->handshake_buffer) {
@ -3269,8 +3297,10 @@ int ssl3_get_client_certificate(SSL *s)
if (0) { if (0) {
f_err: f_err:
ssl3_send_alert(s, SSL3_AL_FATAL, al); ssl3_send_alert(s, SSL3_AL_FATAL, al);
}
err: err:
s->state = SSL_ST_ERR;
}
if (x != NULL) if (x != NULL)
X509_free(x); X509_free(x);
if (sk != NULL) if (sk != NULL)
@ -3290,12 +3320,14 @@ int ssl3_send_server_certificate(SSL *s)
(s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5)) { (s->s3->tmp.new_cipher->algorithm_mkey & SSL_kKRB5)) {
SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE, SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE,
ERR_R_INTERNAL_ERROR); ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return (0); return (0);
} }
} }
if (!ssl3_output_cert_chain(s, cpk)) { if (!ssl3_output_cert_chain(s, cpk)) {
SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE, ERR_R_INTERNAL_ERROR); SSLerr(SSL_F_SSL3_SEND_SERVER_CERTIFICATE, ERR_R_INTERNAL_ERROR);
s->state = SSL_ST_ERR;
return (0); return (0);
} }
s->state = SSL3_ST_SW_CERT_B; s->state = SSL3_ST_SW_CERT_B;
@ -3329,11 +3361,15 @@ int ssl3_send_newsession_ticket(SSL *s)
* Some length values are 16 bits, so forget it if session is too * Some length values are 16 bits, so forget it if session is too
* long * long
*/ */
if (slen_full == 0 || slen_full > 0xFF00) if (slen_full == 0 || slen_full > 0xFF00) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
senc = OPENSSL_malloc(slen_full); senc = OPENSSL_malloc(slen_full);
if (!senc) if (!senc) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
EVP_CIPHER_CTX_init(&ctx); EVP_CIPHER_CTX_init(&ctx);
HMAC_CTX_init(&hctx); HMAC_CTX_init(&hctx);
@ -3448,6 +3484,7 @@ int ssl3_send_newsession_ticket(SSL *s)
OPENSSL_free(senc); OPENSSL_free(senc);
EVP_CIPHER_CTX_cleanup(&ctx); EVP_CIPHER_CTX_cleanup(&ctx);
HMAC_CTX_cleanup(&hctx); HMAC_CTX_cleanup(&hctx);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
@ -3461,8 +3498,10 @@ int ssl3_send_cert_status(SSL *s)
* 1 (ocsp response type) + 3 (ocsp response length) * 1 (ocsp response type) + 3 (ocsp response length)
* + (ocsp response) * + (ocsp response)
*/ */
if (!BUF_MEM_grow(s->init_buf, 8 + s->tlsext_ocsp_resplen)) if (!BUF_MEM_grow(s->init_buf, 8 + s->tlsext_ocsp_resplen)) {
s->state = SSL_ST_ERR;
return -1; return -1;
}
p = (unsigned char *)s->init_buf->data; p = (unsigned char *)s->init_buf->data;
@ -3505,6 +3544,7 @@ int ssl3_get_next_proto(SSL *s)
if (!s->s3->next_proto_neg_seen) { if (!s->s3->next_proto_neg_seen) {
SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSLerr(SSL_F_SSL3_GET_NEXT_PROTO,
SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION); SSL_R_GOT_NEXT_PROTO_WITHOUT_EXTENSION);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
@ -3524,11 +3564,14 @@ int ssl3_get_next_proto(SSL *s)
*/ */
if (!s->s3->change_cipher_spec) { if (!s->s3->change_cipher_spec) {
SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS); SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, SSL_R_GOT_NEXT_PROTO_BEFORE_A_CCS);
s->state = SSL_ST_ERR;
return -1; return -1;
} }
if (n < 2) if (n < 2) {
s->state = SSL_ST_ERR;
return 0; /* The body must be > 1 bytes long */ return 0; /* The body must be > 1 bytes long */
}
p = (unsigned char *)s->init_msg; p = (unsigned char *)s->init_msg;
@ -3540,15 +3583,20 @@ int ssl3_get_next_proto(SSL *s)
* uint8 padding[padding_len]; * uint8 padding[padding_len];
*/ */
proto_len = p[0]; proto_len = p[0];
if (proto_len + 2 > s->init_num) if (proto_len + 2 > s->init_num) {
s->state = SSL_ST_ERR;
return 0; return 0;
}
padding_len = p[proto_len + 1]; padding_len = p[proto_len + 1];
if (proto_len + padding_len + 2 != s->init_num) if (proto_len + padding_len + 2 != s->init_num) {
s->state = SSL_ST_ERR;
return 0; return 0;
}
s->next_proto_negotiated = OPENSSL_malloc(proto_len); s->next_proto_negotiated = OPENSSL_malloc(proto_len);
if (!s->next_proto_negotiated) { if (!s->next_proto_negotiated) {
SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, ERR_R_MALLOC_FAILURE); SSLerr(SSL_F_SSL3_GET_NEXT_PROTO, ERR_R_MALLOC_FAILURE);
s->state = SSL_ST_ERR;
return 0; return 0;
} }
memcpy(s->next_proto_negotiated, p + 1, proto_len); memcpy(s->next_proto_negotiated, p + 1, proto_len);