diff options
| author | Matt Caswell <matt@openssl.org> | 2017-05-16 17:28:23 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-05-19 08:47:08 +0100 |
| commit | fb34a0f4e033246ef5f957bc57d2ebc904a519fc (patch) | |
| tree | 1db7d3e04ad02459db6fb04dd264cf7936dc34e4 /ssl/ssl_sess.c | |
| parent | d8028b202bfe337200a0cc89b80983ea1838cb30 (diff) | |
| download | openssl-new-fb34a0f4e033246ef5f957bc57d2ebc904a519fc.tar.gz | |
Try to be more consistent about the alerts we send
We are quite inconsistent about which alerts get sent. Specifically, these
alerts should be used (normally) in the following circumstances:
SSL_AD_DECODE_ERROR = The peer sent a syntactically incorrect message
SSL_AD_ILLEGAL_PARAMETER = The peer sent a message which was syntactically
correct, but a parameter given is invalid for the context
SSL_AD_HANDSHAKE_FAILURE = The peer's messages were syntactically and
semantically correct, but the parameters provided were unacceptable to us
(e.g. because we do not support the requested parameters)
SSL_AD_INTERNAL_ERROR = We messed up (e.g. malloc failure)
The standards themselves aren't always consistent but I think the above
represents the best interpretation.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3480)
Diffstat (limited to 'ssl/ssl_sess.c')
| -rw-r--r-- | ssl/ssl_sess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/ssl_sess.c b/ssl/ssl_sess.c index 7a3d858c0a..5bef168abd 100644 --- a/ssl/ssl_sess.c +++ b/ssl/ssl_sess.c @@ -603,7 +603,7 @@ int ssl_get_prev_session(SSL *s, CLIENTHELLO_MSG *hello, int *al) /* If old session includes extms, but new does not: abort handshake */ if (!(s->s3->flags & TLS1_FLAGS_RECEIVED_EXTMS)) { SSLerr(SSL_F_SSL_GET_PREV_SESSION, SSL_R_INCONSISTENT_EXTMS); - ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_HANDSHAKE_FAILURE); + ssl3_send_alert(s, SSL3_AL_FATAL, SSL_AD_ILLEGAL_PARAMETER); fatal = 1; goto err; } |