[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  ce6766de69030b66634518e54dbd301308a51e11 (commit)
      from  88806cfc611935981e3752dccda1685022be2e2b (commit)


- Log -----------------------------------------------------------------
commit ce6766de69030b66634518e54dbd301308a51e11
Author: Rich Salz <rsalz at openssl.org>
Date:   Sun Apr 26 16:43:18 2015 -0400

    Fix error message
    
    Reviewed-by: Viktor Dukhovni <viktor at openssl.org>

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

Summary of changes:
 apps/s_server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/s_server.c b/apps/s_server.c
index 20f6375..e12db0c 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -3197,7 +3197,7 @@ static int add_session(SSL *ssl, SSL_SESSION *session)
 
     /* Assume it still works. */
     if (i2d_SSL_SESSION(session, &p) != sess->derlen) {
-        BIO_printf(bio_err, "Re-encoding session strangeness\n");
+        BIO_printf(bio_err, "Unexpected session encoding length\n");
         OPENSSL_free(sess->id);
         OPENSSL_free(sess->der);
         OPENSSL_free(sess);