From d675e841ef78a78bab5972d63fa3d8d15ecdbb19 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 11 Jun 2015 19:00:55 +0000 Subject: Merge OpenSSL 1.0.1n. --- crypto/openssl/ssl/ssl_stat.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'crypto/openssl/ssl/ssl_stat.c') 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"; -- cgit v1.1