summaryrefslogtreecommitdiffstats
path: root/ssl/ssl_err.c
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2017-03-09 15:31:55 +0000
committerMatt Caswell <matt@openssl.org>2017-03-16 14:20:38 +0000
commit6594189fa16e845df5565ca4c180220783a752d4 (patch)
tree514548179aec57eb0c814ee06a3a879f4a676e22 /ssl/ssl_err.c
parentef6c191bceb7f09918cfd39e780759c32afb2396 (diff)
Merge early_data_info extension into early_data
As per draft-19 Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2895)
Diffstat (limited to 'ssl/ssl_err.c')
-rw-r--r--ssl/ssl_err.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ssl/ssl_err.c b/ssl/ssl_err.c
index f8d344b563..c476b1e7e0 100644
--- a/ssl/ssl_err.c
+++ b/ssl/ssl_err.c
@@ -405,6 +405,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
"tls_parse_ctos_renegotiate"},
{ERR_FUNC(SSL_F_TLS_PARSE_CTOS_USE_SRTP), "tls_parse_ctos_use_srtp"},
{ERR_FUNC(SSL_F_TLS_PARSE_STOC_COOKIE), "tls_parse_stoc_cookie"},
+ {ERR_FUNC(SSL_F_TLS_PARSE_STOC_EARLY_DATA), "tls_parse_stoc_early_data"},
{ERR_FUNC(SSL_F_TLS_PARSE_STOC_EARLY_DATA_INFO),
"tls_parse_stoc_early_data_info"},
{ERR_FUNC(SSL_F_TLS_PARSE_STOC_KEY_SHARE), "tls_parse_stoc_key_share"},