summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/ssl_stat.c
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2015-06-11 19:07:45 +0000
committerjkim <jkim@FreeBSD.org>2015-06-11 19:07:45 +0000
commit5c266cb7c932e78233437385fe6993499ad9e2ea (patch)
treefb5b3a19a5d9e924a0f43b0ef4999a09e22aa1b4 /crypto/openssl/ssl/ssl_stat.c
parent3a6c5b791fafa79766a5c99c288a7d1ef495157a (diff)
downloadFreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.zip
FreeBSD-src-5c266cb7c932e78233437385fe6993499ad9e2ea.tar.gz
MFC: r284283
Merge OpenSSL 1.0.1n.
Diffstat (limited to 'crypto/openssl/ssl/ssl_stat.c')
-rw-r--r--crypto/openssl/ssl/ssl_stat.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/ssl_stat.c b/crypto/openssl/ssl/ssl_stat.c
index d725d78..1b9069f 100644
--- a/crypto/openssl/ssl/ssl_stat.c
+++ b/crypto/openssl/ssl/ssl_stat.c
@@ -117,6 +117,9 @@ const char *SSL_state_string_long(const SSL *s)
case SSL_ST_OK | SSL_ST_ACCEPT:
str = "ok/accept SSL initialization";
break;
+ case SSL_ST_ERR:
+ str = "error";
+ break;
#ifndef OPENSSL_NO_SSL2
case SSL2_ST_CLIENT_START_ENCRYPTION:
str = "SSLv2 client start encryption";
@@ -496,6 +499,9 @@ const char *SSL_state_string(const SSL *s)
case SSL_ST_OK:
str = "SSLOK ";
break;
+ case SSL_ST_ERR:
+ str = "SSLERR";
+ break;
#ifndef OPENSSL_NO_SSL2
case SSL2_ST_CLIENT_START_ENCRYPTION:
str = "2CSENC";
OpenPOWER on IntegriCloud