diff options
| author | Matt Caswell <matt@openssl.org> | 2017-07-21 11:41:05 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-08-31 15:03:34 +0100 |
| commit | ffc5bbaaee2bfaba8d420e912c4d77b4090b896f (patch) | |
| tree | 9dd6c92e4c0e5a009b21e58d8a8b342aad53e55c /ssl/ssl_err.c | |
| parent | 67738645dc0b044fc7d120a3c67af5635d0d78ec (diff) | |
Complain if we are writing early data but SNI or ALPN is incorrect
SNI and ALPN must be set to be consistent with the PSK. Otherwise this is
an error.
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
(Merged from https://github.com/openssl/openssl/pull/3926)
Diffstat (limited to 'ssl/ssl_err.c')
| -rw-r--r-- | ssl/ssl_err.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c index dc1d439b1b..0ce7f271f3 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -724,6 +724,10 @@ static const ERR_STRING_DATA SSL_str_reasons[] = { "inappropriate fallback"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_COMPRESSION), "inconsistent compression"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_ALPN), + "inconsistent early data alpn"}, + {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EARLY_DATA_SNI), + "inconsistent early data sni"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INCONSISTENT_EXTMS), "inconsistent extms"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_ALERT), "invalid alert"}, {ERR_PACK(ERR_LIB_SSL, 0, SSL_R_INVALID_COMMAND), "invalid command"}, |