[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  10281e83eac0fb96de3f14855154197aa33bb800 (commit)
      from  4e360445473c3da938703a8142a36cf6ee86a191 (commit)


- Log -----------------------------------------------------------------
commit 10281e83eac0fb96de3f14855154197aa33bb800
Author: Rich Salz <rsalz at openssl.org>
Date:   Tue Aug 7 15:08:03 2018 -0400

    Fix setting of ssl_strings_inited.
    
    Thanks to GitHub user zsergey105 for reporting this.
    
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/6875)

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

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

diff --git a/ssl/ssl_init.c b/ssl/ssl_init.c
index ed2bf84..c0ccb93 100644
--- a/ssl/ssl_init.c
+++ b/ssl/ssl_init.c
@@ -129,8 +129,8 @@ DEFINE_RUN_ONCE_STATIC(ossl_init_load_ssl_strings)
             "ERR_load_SSL_strings()\n");
 # endif
     ERR_load_SSL_strings();
-#endif
     ssl_strings_inited = 1;
+#endif
     return 1;
 }