[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  f978f2b8af576ed1d9409de440b5c1f97ac0e7ab (commit)
      from  5bd051a0dcd4f04bc9ea197f74b34612b3fcca84 (commit)


- Log -----------------------------------------------------------------
commit f978f2b8af576ed1d9409de440b5c1f97ac0e7ab
Author: Xiaoyin Liu <xiaoyinl at users.noreply.github.com>
Date:   Mon Jul 31 08:55:37 2017 -0400

    Fix errors in SSL_state_string_long
    
    TLS_ST_SR_NEXT_PROTO means "SSLv3/TLS read next proto"
    Fix typo in the message for TLS_ST_SW_CERT_STATUS
    
    Reviewed-by: Andy Polyakov <appro at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4054)

-----------------------------------------------------------------------

Summary of changes:
 ssl/ssl_stat.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ssl/ssl_stat.c b/ssl/ssl_stat.c
index 8457930..405924d 100644
--- a/ssl/ssl_stat.c
+++ b/ssl/ssl_stat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  * Copyright 2005 Nokia. All rights reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
@@ -22,9 +22,9 @@ const char *SSL_state_string_long(const SSL *s)
     case TLS_ST_CW_NEXT_PROTO:
         return "SSLv3/TLS write next proto";
     case TLS_ST_SR_NEXT_PROTO:
-        return "SSLv3/TLS write next proto";
+        return "SSLv3/TLS read next proto";
     case TLS_ST_SW_CERT_STATUS:
-        return "SSLv3/TLS write next proto";
+        return "SSLv3/TLS write certificate status";
     case TLS_ST_BEFORE:
         return "before SSL initialization";
     case TLS_ST_OK: