diff options
| author | Matt Caswell <matt@openssl.org> | 2017-01-18 11:31:37 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-01-30 10:18:20 +0000 |
| commit | f4bbb37c4c95ea8cdb4b3470098a1b5d7d1977ed (patch) | |
| tree | 92ec8b6c8c0c59507b74ecb90834701b1a1bf7f9 /ssl/ssl_err.c | |
| parent | 4ff65f77b62df12ad75ec232b38627c5fe131041 (diff) | |
Provide a key_share extension finaliser
This mops up various edge cases with key_shares and makes sure we still
generate the handshake secret if we haven't been provided with one but we
have a PSK.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2259)
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 9b02c58737..9edee93727 100644 --- a/ssl/ssl_err.c +++ b/ssl/ssl_err.c @@ -51,6 +51,7 @@ static ERR_STRING_DATA SSL_str_functs[] = { {ERR_FUNC(SSL_F_DTLS_PROCESS_HELLO_VERIFY), "dtls_process_hello_verify"}, {ERR_FUNC(SSL_F_FINAL_EC_PT_FORMATS), "final_ec_pt_formats"}, {ERR_FUNC(SSL_F_FINAL_EMS), "final_ems"}, + {ERR_FUNC(SSL_F_FINAL_KEY_SHARE), "final_key_share"}, {ERR_FUNC(SSL_F_FINAL_RENEGOTIATE), "final_renegotiate"}, {ERR_FUNC(SSL_F_FINAL_SIG_ALGS), "final_sig_algs"}, {ERR_FUNC(SSL_F_NSS_KEYLOG_INT), "nss_keylog_int"}, |