summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-07-21 11:41:05 +0100
committerMatt Caswell <matt@openssl.org>2017-08-31 15:03:34 +0100
commitffc5bbaaee2bfaba8d420e912c4d77b4090b896f (patch)
tree9dd6c92e4c0e5a009b21e58d8a8b342aad53e55c /include
parent67738645dc0b044fc7d120a3c67af5635d0d78ec (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 'include')
-rw-r--r--include/openssl/sslerr.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h
index bc4c17e4d1..91f6d21fb4 100644
--- a/include/openssl/sslerr.h
+++ b/include/openssl/sslerr.h
@@ -458,6 +458,8 @@ int ERR_load_SSL_strings(void);
# define SSL_R_ILLEGAL_SUITEB_DIGEST 380
# define SSL_R_INAPPROPRIATE_FALLBACK 373
# define SSL_R_INCONSISTENT_COMPRESSION 340
+# define SSL_R_INCONSISTENT_EARLY_DATA_ALPN 222
+# define SSL_R_INCONSISTENT_EARLY_DATA_SNI 231
# define SSL_R_INCONSISTENT_EXTMS 104
# define SSL_R_INVALID_ALERT 205
# define SSL_R_INVALID_COMMAND 280