diff options
| author | Matt Caswell <matt@openssl.org> | 2017-03-07 10:21:58 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-07 16:41:25 +0000 |
| commit | 524420d8459fa07a8e4900bc9dfb558b215edbbd (patch) | |
| tree | 6792e3cd7069ee3d658d6e1e3fd3fa16fc080454 /ssl/ssl_err.c | |
| parent | b8c49611bc26c8f9a980b814496a3069cd524b79 (diff) | |
Check TLSv1.3 ServerHello, Finished and KeyUpdates are on record boundary
In TLSv1.3 the above messages signal a key change. The spec requires that
the end of these messages must align with a record boundary. We can detect
this by checking for decrypted but as yet unread record data sitting in
OpenSSL buffers at the point where we process the messages.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2875)
Diffstat (limited to 'ssl/ssl_err.c')
| -rw-r--r-- | ssl/ssl_err.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index ee1ca6293c..23987e64a4 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -625,6 +625,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = { {ERR_REASON(SSL_R_MISSING_SRP_PARAM), "can't find SRP server param"}, {ERR_REASON(SSL_R_MISSING_TMP_DH_KEY), "missing tmp dh key"}, {ERR_REASON(SSL_R_MISSING_TMP_ECDH_KEY), "missing tmp ecdh key"}, + {ERR_REASON(SSL_R_NOT_ON_RECORD_BOUNDARY), "not on record boundary"}, {ERR_REASON(SSL_R_NO_CERTIFICATES_RETURNED), "no certificates returned"}, {ERR_REASON(SSL_R_NO_CERTIFICATE_ASSIGNED), "no certificate assigned"}, {ERR_REASON(SSL_R_NO_CERTIFICATE_SET), "no certificate set"}, |