diff options
| author | Matt Caswell <matt@openssl.org> | 2017-02-21 09:22:22 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-02 17:44:14 +0000 |
| commit | 49e7fe12eac1e84af726e0110ee29073699ed46b (patch) | |
| tree | f36e1908e9a4af56dc9fa7339b21d1200f52ed2b /ssl/s3_msg.c | |
| parent | 5d5b3fba1fc15e3a63876aa9c8deae351369781b (diff) | |
Provide functions to write early data
We provide SSL_write_early() which *must* be called first on a connection
(prior to any other IO function including SSL_connect()/SSL_do_handshake()).
Also SSL_write_early_finish() which signals the end of early data.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2737)
Diffstat (limited to 'ssl/s3_msg.c')
| -rw-r--r-- | ssl/s3_msg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ssl/s3_msg.c b/ssl/s3_msg.c index 743a02b8d1..7af2f99e05 100644 --- a/ssl/s3_msg.c +++ b/ssl/s3_msg.c @@ -63,7 +63,10 @@ int ssl3_do_change_cipher_spec(SSL *s) int ssl3_send_alert(SSL *s, int level, int desc) { /* Map tls/ssl alert value to correct one */ - desc = s->method->ssl3_enc->alert_value(desc); + if (SSL_TREAT_AS_TLS13(s)) + desc = tls13_alert_code(desc); + else + desc = s->method->ssl3_enc->alert_value(desc); if (s->version == SSL3_VERSION && desc == SSL_AD_PROTOCOL_VERSION) desc = SSL_AD_HANDSHAKE_FAILURE; /* SSL 3.0 does not have * protocol_version alerts */ |