Merge pull request cpp-netlib#610 from ckaminski/master

deanberris · deanberris · commit 80c05e4fe5ec · 2016-03-02T11:37:25.000-08:00
Adding ssl_server example to default build
diff --git a/libs/network/example/CMakeLists.txt b/libs/network/example/CMakeLists.txt
@@ -17,6 +17,7 @@ add_executable(hello_world_server http/hello_world_server.cpp)
 add_executable(hello_world_client http/hello_world_client.cpp)
 add_executable(hello_world_async_server_with_work_queue http/hello_world_async_server_with_work_queue.cpp)
 add_executable(trivial_google trivial_google.cpp)
+
 if (UNIX)
   add_executable(fileserver http/fileserver.cpp)
 endif (UNIX)
@@ -66,6 +67,17 @@ target_link_libraries(hello_world_async_server_with_work_queue
     cppnetlib-client-connections
     cppnetlib-server-parsers)
 
+if (OPENSSL_FOUND)
+    add_executable(ssl_server http/ssl/ssl_server.cpp)
+    add_dependencies(ssl_server cppnetlib-uri cppnetlib-client-connections)
+    target_link_libraries(ssl_server
+        ${CMAKE_THREAD_LIBS_INIT}
+        cppnetlib-server-parsers
+        cppnetlib-uri
+        cppnetlib-client-connections)
+endif (OPENSSL_FOUND)
+
+
 if (OPENSSL_FOUND)
   target_link_libraries(http_client ${OPENSSL_LIBRARIES})
   target_link_libraries(simple_wget ${OPENSSL_LIBRARIES})
@@ -74,6 +86,7 @@ if (OPENSSL_FOUND)
   target_link_libraries(hello_world_server ${OPENSSL_LIBRARIES})
   target_link_libraries(hello_world_client ${OPENSSL_LIBRARIES})
   target_link_libraries(hello_world_async_server_with_work_queue ${OPENSSL_LIBRARIES})
+  target_link_libraries(ssl_server ${OPENSSL_LIBRARIES})
   target_link_libraries(trivial_google ${OPENSSL_LIBRARIES})
 endif (OPENSSL_FOUND)
 
@@ -85,6 +98,7 @@ if (${CMAKE_CXX_COMPILER_ID} MATCHES GNU AND ${CMAKE_SYSTEM_NAME} MATCHES "Windo
   target_link_libraries(hello_world_server ws2_32 wsock32)
   target_link_libraries(hello_world_client ws2_32)
   target_link_libraries(hello_world_async_server_with_work_queue ws2_32 wsock32)
+  target_link_libraries(ssl_server ws2_32 wsock32)
   target_link_libraries(trivial_google ws2_32)
 endif()
 
@@ -97,6 +111,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   target_link_libraries(hello_world_client rt)
   target_link_libraries(hello_world_async_server_with_work_queue rt)
   target_link_libraries(trivial_google rt)
+  if (OPENSSL_FOUND)
+    target_link_libraries(ssl_server rt)
+  endif (OPENSSL_FOUND)
 endif()
 
 if (UNIX)
@@ -119,7 +136,10 @@ set_target_properties(trivial_google PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-N
 set_target_properties(hello_world_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(hello_world_client PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 set_target_properties(hello_world_async_server_with_work_queue PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
-
+if (OPENSSL_FOUND)
+  set_target_properties(ssl_server PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
+endif (OPENSSL_FOUND)
+  
 if (UNIX)
   set_target_properties(fileserver PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CPP-NETLIB_BINARY_DIR}/example)
 endif (UNIX)
diff --git a/libs/network/example/http/ssl/dh2048.pem b/libs/network/example/http/ssl/dh2048.pem
@@ -0,0 +1,8 @@
+-----BEGIN DH PARAMETERS-----
+MIIBCAKCAQEA1wI+wQdLMRtQK+0EIXNg+g+J/EhIZedqdkSKKLIdclDAjUdbnDWJ
+rMR76tKGItPb0LkWHfxJkrziyvZRO2KWTThQ1Tz05x+OgM2ckHT+QsTxNqOosvdT
+pOtMt260WaXVYvHJ0CZgTo7+DUcXNYZW/xvSW206RW9oJIgqCFrhUrKGpVFuqLZZ
+Nwjy62Ueg3TUwE5D5K0xgUjyCAuHZmeI2uQUbJS6u9GeraV5h0QtH3njDS6mD64v
+cN5MqQXO1UTl4sQUhDPamyiJz57/o/jinHJUDLz1FGS8kOR8ecYAx8JryFgm4qPd
++MYaDDIJku8f19Rnjb1SI/Y28uHL9X2dswIBAg==
+-----END DH PARAMETERS-----
diff --git a/libs/network/example/http/ssl/dh512.pem b/libs/network/example/http/ssl/dh512.pem
diff --git a/libs/network/example/http/ssl/ssl_server.cpp b/libs/network/example/http/ssl/ssl_server.cpp
@@ -19,7 +19,7 @@
 #include <signal.h>
 
 struct handler;
-typedef boost::network::http::async_server<handler> server;
+typedef boost::network::http::server<handler> server;
 
 std::string password_callback(
     std::size_t max_length,
@@ -78,7 +78,7 @@ int main(void) try {
   ctx->set_password_callback(password_callback);
   ctx->use_certificate_chain_file("server.pem");
   ctx->use_private_key_file("server.pem", asio::ssl::context::pem);
-  ctx->use_tmp_dh_file("dh512.pem");
+  ctx->use_tmp_dh_file("dh2048.pem");
 
   // setup the async server
   handler request_handler;
