summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/ssl_err.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2016-01-28 20:15:22 +0000
committerjkim <jkim@FreeBSD.org>2016-01-28 20:15:22 +0000
commitf91c9c279859e792ca6fea3a5d5a9074b72c0e44 (patch)
treed1486d18bb9fa5f51cadbaccb04f3c3879e273ec /crypto/openssl/ssl/ssl_err.c
parentd04bd9e9248a5b28fa75fdc94acf9ecb1c4cf4a4 (diff)
parent71cece53f20ad0348c8e6a83b032a4bcfa42cdcf (diff)
downloadFreeBSD-src-f91c9c279859e792ca6fea3a5d5a9074b72c0e44.zip
FreeBSD-src-f91c9c279859e792ca6fea3a5d5a9074b72c0e44.tar.gz
Merge OpenSSL 1.0.2f.
Relnotes: yes
Diffstat (limited to 'crypto/openssl/ssl/ssl_err.c')
-rw-r--r--crypto/openssl/ssl/ssl_err.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_err.c b/crypto/openssl/ssl/ssl_err.c
index 6d1366f..dd3b2af 100644
--- a/crypto/openssl/ssl/ssl_err.c
+++ b/crypto/openssl/ssl/ssl_err.c
@@ -206,6 +206,7 @@ static ERR_STRING_DATA SSL_str_functs[] = {
{ERR_FUNC(SSL_F_SSL3_SETUP_KEY_BLOCK), "ssl3_setup_key_block"},
{ERR_FUNC(SSL_F_SSL3_SETUP_READ_BUFFER), "ssl3_setup_read_buffer"},
{ERR_FUNC(SSL_F_SSL3_SETUP_WRITE_BUFFER), "ssl3_setup_write_buffer"},
+ {ERR_FUNC(SSL_F_SSL3_SHUTDOWN), "ssl3_shutdown"},
{ERR_FUNC(SSL_F_SSL3_WRITE_BYTES), "ssl3_write_bytes"},
{ERR_FUNC(SSL_F_SSL3_WRITE_PENDING), "ssl3_write_pending"},
{ERR_FUNC(SSL_F_SSL_ADD_CERT_CHAIN), "ssl_add_cert_chain"},
@@ -647,6 +648,7 @@ static ERR_STRING_DATA SSL_str_reasons[] = {
{ERR_REASON(SSL_R_SESSION_ID_CONTEXT_UNINITIALIZED),
"session id context uninitialized"},
{ERR_REASON(SSL_R_SHORT_READ), "short read"},
+ {ERR_REASON(SSL_R_SHUTDOWN_WHILE_IN_INIT), "shutdown while in init"},
{ERR_REASON(SSL_R_SIGNATURE_ALGORITHMS_ERROR),
"signature algorithms error"},
{ERR_REASON(SSL_R_SIGNATURE_FOR_NON_SIGNING_CERTIFICATE),
OpenPOWER on IntegriCloud