From 455d911f6145179766c4815d1566b4bee705ff31 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sat, 2 Aug 2014 10:11:45 +0900
Subject: [PATCH] src, examples: Call OPENSSL_config()

---
 examples/client.c          | 3 +++
 examples/libevent-client.c | 3 +++
 examples/libevent-server.c | 3 +++
 src/h2load.cc              | 3 +++
 src/nghttp.cc              | 3 +++
 src/nghttpd.cc             | 2 ++
 src/shrpx.cc               | 2 ++
 7 files changed, 19 insertions(+)

diff --git a/examples/client.c b/examples/client.c
index 181ad77c..57a9cc96 100644
--- a/examples/client.c
+++ b/examples/client.c
@@ -44,6 +44,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 enum {
   IO_NONE,
@@ -685,6 +686,8 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, 0);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 
diff --git a/examples/libevent-client.c b/examples/libevent-client.c
index 598c67e7..fbc34626 100644
--- a/examples/libevent-client.c
+++ b/examples/libevent-client.c
@@ -32,6 +32,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event.h>
 #include <event2/event.h>
@@ -560,6 +561,8 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, NULL);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 
diff --git a/examples/libevent-server.c b/examples/libevent-server.c
index 5f8487a2..d380aff8 100644
--- a/examples/libevent-server.c
+++ b/examples/libevent-server.c
@@ -36,6 +36,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event.h>
 #include <event2/event.h>
@@ -755,6 +756,8 @@ int main(int argc, char **argv)
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, NULL);
 
+  OPENSSL_config(NULL);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 
diff --git a/src/h2load.cc b/src/h2load.cc
index 1f35c9ed..f5573703 100644
--- a/src/h2load.cc
+++ b/src/h2load.cc
@@ -44,6 +44,7 @@
 #include <event2/bufferevent_ssl.h>
 
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include "http-parser/http_parser.h"
 
@@ -814,6 +815,8 @@ int main(int argc, char **argv)
   memset(&act, 0, sizeof(struct sigaction));
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, nullptr);
+  OPENSSL_config(nullptr);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
 
diff --git a/src/nghttp.cc b/src/nghttp.cc
index 7a7c2752..699605be 100644
--- a/src/nghttp.cc
+++ b/src/nghttp.cc
@@ -54,6 +54,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event.h>
 #include <event2/event.h>
@@ -2076,6 +2077,8 @@ int main(int argc, char **argv)
   memset(&act, 0, sizeof(struct sigaction));
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, nullptr);
+  OPENSSL_config(nullptr);
+  OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
   reset_timer();
diff --git a/src/nghttpd.cc b/src/nghttpd.cc
index fc3adc7c..a75a23b9 100644
--- a/src/nghttpd.cc
+++ b/src/nghttpd.cc
@@ -37,6 +37,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 #include <nghttp2/nghttp2.h>
 
 #include "app_helper.h"
@@ -290,6 +291,7 @@ int main(int argc, char **argv)
   memset(&act, 0, sizeof(struct sigaction));
   act.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &act, nullptr);
+  OPENSSL_config(nullptr);
   OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();
diff --git a/src/shrpx.cc b/src/shrpx.cc
index 1e74a6bf..2cf67e66 100644
--- a/src/shrpx.cc
+++ b/src/shrpx.cc
@@ -45,6 +45,7 @@
 
 #include <openssl/ssl.h>
 #include <openssl/err.h>
+#include <openssl/conf.h>
 
 #include <event2/listener.h>
 
@@ -1252,6 +1253,7 @@ int main(int argc, char **argv)
 
   // Initialize OpenSSL before parsing options because we create
   // SSL_CTX there.
+  OPENSSL_config(nullptr);
   OpenSSL_add_all_algorithms();
   SSL_load_error_strings();
   SSL_library_init();