Browse Source

Examples: Remove certificate example

The example is also covered by the server_ctt and encryption examples.
Julius Pfrommer 5 years ago
parent
commit
4e38d391dd
4 changed files with 2 additions and 64 deletions
  1. 0 3
      CMakeLists.txt
  2. 0 11
      examples/CMakeLists.txt
  3. 0 45
      examples/server_certificate.c
  4. 2 5
      tools/travis/travis_linux_script.sh

+ 0 - 3
CMakeLists.txt

@@ -336,9 +336,6 @@ option(UA_BUILD_OSS_FUZZ "Special build switch used in oss-fuzz" OFF)
 mark_as_advanced(UA_BUILD_OSS_FUZZ)
 
 # Advanced Build Targets
-option(UA_BUILD_SELFSIGNED_CERTIFICATE "Generate self-signed certificate" OFF)
-mark_as_advanced(UA_BUILD_SELFSIGNED_CERTIFICATE)
-
 option(UA_PACK_DEBIAN "Special build switch used in .deb packaging" OFF)
 mark_as_advanced(UA_PACK_DEBIAN)
 

+ 0 - 11
examples/CMakeLists.txt

@@ -162,17 +162,6 @@ if(UA_ENABLE_NODEMANAGEMENT)
     add_example(access_control_client access_control/client_access_control.c)
 endif()
 
-if(UA_BUILD_SELFSIGNED_CERTIFICATE)
-  find_package(OpenSSL REQUIRED)
-  add_custom_command(OUTPUT server_cert.der
-                     COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_SOURCE_DIR}/tools/certs/create_self-signed.py ${CMAKE_CURRENT_BINARY_DIR}
-                     DEPENDS ${CMAKE_SOURCE_DIR}/tools/certs/create_self-signed.py
-                             ${CMAKE_SOURCE_DIR}/tools/certs/localhost.cnf)
-  add_custom_target(selfsigned ALL DEPENDS server_cert.der)
-  add_executable(server_certificate server_certificate.c ${STATIC_OBJECTS} server_cert.der)
-  target_link_libraries(server_certificate open62541 ${open62541_LIBRARIES})
-endif()
-
 if(UA_ENABLE_DISCOVERY_MULTICAST)
     add_example(discovery_server_lds discovery/server_lds.c)
     add_example(discovery_server_register discovery/server_register.c)

+ 0 - 45
examples/server_certificate.c

@@ -1,45 +0,0 @@
-/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
- * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. */
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS //disable fopen deprication warning in msvs
-#endif
-
-#include <ua_server.h>
-#include <ua_config_default.h>
-#include <ua_log_stdout.h>
-
-#include "common.h"
-
-#include <signal.h>
-#include <stdlib.h>
-
-UA_Boolean running = true;
-
-static void stopHandler(int sign) {
-    UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "received ctrl-c");
-    running = false;
-}
-
-int main(int argc, char** argv) {
-    signal(SIGINT, stopHandler); /* catches ctrl-c */
-
-    UA_ServerConfig *config = UA_ServerConfig_new_default();
-
-    /* load certificate */
-    config->serverCertificate = loadFile("server_cert.der");
-    if(config->serverCertificate.length > 0)
-        UA_LOG_INFO(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Certificate loaded");
-
-    UA_Server *server = UA_Server_new(config);
-
-    UA_StatusCode retval = UA_Server_run(server, &running);
-
-    /* deallocate certificate's memory */
-    UA_ByteString_clear(&config->serverCertificate);
-
-    UA_Server_delete(server);
-    UA_ServerConfig_delete(config);
-
-    return retval == UA_STATUSCODE_GOOD ? EXIT_SUCCESS : EXIT_FAILURE;
-}

+ 2 - 5
tools/travis/travis_linux_script.sh

@@ -204,20 +204,17 @@ fi
 
 echo -en "\r\n=== Building ===\r\n"
 
-echo -e "\r\n== Documentation and certificate build =="  && echo -en 'travis_fold:start:script.build.doc\\r'
+echo -e "\r\n== Documentation build =="  && echo -en 'travis_fold:start:script.build.doc\\r'
 mkdir -p build
 cd build
 cmake \
     -DCMAKE_BUILD_TYPE=Release \
     -DPYTHON_EXECUTABLE:FILEPATH=/usr/bin/$PYTHON \
-    -DUA_BUILD_EXAMPLES=ON \
-    -DUA_BUILD_SELFSIGNED_CERTIFICATE=ON ..
+    -DUA_BUILD_EXAMPLES=ON ..
 make doc
 make doc_pdf
-make selfsigned
 cp -r doc ../../
 cp -r doc_latex ../../
-cp ./examples/server_cert.der ../../
 cd .. && rm build -rf
 echo -en 'travis_fold:end:script.build.doc\\r'