projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32096fd
)
Fix setting of ssl_strings_inited.
author
Rich Salz
<rsalz@openssl.org>
Tue, 7 Aug 2018 19:08:03 +0000
(15:08 -0400)
committer
Rich Salz
<rsalz@openssl.org>
Tue, 7 Aug 2018 19:19:42 +0000
(15:19 -0400)
Thanks to GitHub user zsergey105 for reporting this.
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/6875)
(cherry picked from commit
10281e83eac0fb96de3f14855154197aa33bb800
)
ssl/ssl_init.c
patch
|
blob
|
history
diff --git
a/ssl/ssl_init.c
b/ssl/ssl_init.c
index c91e1c56e2854007c460fb01eaf1d173cbb56873..0b9155d926d0660fe99dd54fff918df89f69dabc 100644
(file)
--- a/
ssl/ssl_init.c
+++ b/
ssl/ssl_init.c
@@
-127,8
+127,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;
}