diff options
| author | marha <marha@users.sourceforge.net> | 2015-06-15 20:18:50 +0200 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-06-22 01:39:02 -0400 |
| commit | 76d3cb65aed1b2e454d129eb1e187e896f5e3a2a (patch) | |
| tree | bca8e882abc81afce4770da47751e08f1bbeecec /openssl/ssl/ssl_stat.c | |
| parent | df30d2b2322d7940e83be76b63ce6f5a5a77f5b3 (diff) | |
| download | vcxsrv-76d3cb65aed1b2e454d129eb1e187e896f5e3a2a.tar.gz vcxsrv-76d3cb65aed1b2e454d129eb1e187e896f5e3a2a.tar.bz2 vcxsrv-76d3cb65aed1b2e454d129eb1e187e896f5e3a2a.zip | |
Update to openssl-1.0.2c
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/ssl/ssl_stat.c')
| -rw-r--r-- | openssl/ssl/ssl_stat.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/openssl/ssl/ssl_stat.c b/openssl/ssl/ssl_stat.c index d725d7834..1b9069f97 100644 --- a/openssl/ssl/ssl_stat.c +++ b/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"; |