Single header for all SecurityPolicy plugin implementations

CMakeLists.txt

@@ -536,7 +536,7 @@ set(default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_accesscontrol_defaul
                            ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.h
                            ${PROJECT_SOURCE_DIR}/plugins/ua_nodestore_default.h
                            ${PROJECT_SOURCE_DIR}/plugins/ua_config_default.h
-                           ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_none.h
+                           ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicies.h
 )
 
 set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
@@ -549,8 +549,6 @@ set(default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_log_stdout.c
 )
 
 if(UA_ENABLE_ENCRYPTION)
-    list(APPEND default_plugin_headers ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic128rsa15.h
-                                       ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic256sha256.h)
     list(APPEND default_plugin_sources ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic128rsa15.c
                                        ${PROJECT_SOURCE_DIR}/plugins/ua_securitypolicy_basic256sha256.c)
 endif()

plugins/ua_config_default.c

@@ -18,13 +18,7 @@
 #include "ua_accesscontrol_default.h"
 #include "ua_pki_certificate.h"
 #include "ua_nodestore_default.h"
-#include "ua_securitypolicy_none.h"
-
-#ifdef UA_ENABLE_ENCRYPTION
-#include "ua_securitypolicy_basic128rsa15.h"
-#include "ua_securitypolicy_basic256sha256.h"
-#endif
-
+#include "ua_securitypolicies.h"
 
 /* Struct initialization works across ANSI C/C99/C++ if it is done when the
  * variable is first declared. Assigning values to existing structs is

plugins/ua_securitypolicies.h

@@ -0,0 +1,41 @@
+/* This work is licensed under a Creative Commons CCZero 1.0 Universal License.
+ * See http://creativecommons.org/publicdomain/zero/1.0/ for more information. 
+ *
+ *    Copyright 2017-2018 (c) Mark Giraud, Fraunhofer IOSB
+ *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
+ *    Copyright 2018 (c) Daniel Feist, Precitec GmbH & Co. KG
+ */
+
+#ifndef UA_SECURITYPOLICIES_H_
+#define UA_SECURITYPOLICIES_H_
+
+#include "ua_plugin_securitypolicy.h"
+
+_UA_BEGIN_DECLS
+
+UA_EXPORT UA_StatusCode
+UA_SecurityPolicy_None(UA_SecurityPolicy *policy,
+                       UA_CertificateVerification *certificateVerification,
+                       const UA_ByteString localCertificate, UA_Logger logger);
+
+#ifdef UA_ENABLE_ENCRYPTION
+
+UA_EXPORT UA_StatusCode
+UA_SecurityPolicy_Basic128Rsa15(UA_SecurityPolicy *policy,
+                                UA_CertificateVerification *certificateVerification,
+                                const UA_ByteString localCertificate,
+                                const UA_ByteString localPrivateKey,
+                                UA_Logger logger);
+
+UA_EXPORT UA_StatusCode
+UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
+                                 UA_CertificateVerification *certificateVerification,
+                                 const UA_ByteString localCertificate,
+                                 const UA_ByteString localPrivateKey,
+                                 UA_Logger logger);
+
+#endif
+
+_UA_END_DECLS
+
+#endif /* UA_SECURITYPOLICIES_H_ */

plugins/ua_securitypolicy_basic128rsa15.c

@@ -15,10 +15,9 @@
 #include <mbedtls/version.h>
 #include <mbedtls/sha1.h>
 
-#include "ua_plugin_pki.h"
-#include "ua_plugin_securitypolicy.h"
-#include "ua_securitypolicy_basic128rsa15.h"
 #include "ua_types.h"
+#include "ua_plugin_pki.h"
+#include "ua_securitypolicies.h"
 #include "ua_types_generated_handling.h"
 
 /* Notes:
@@ -78,7 +77,6 @@ typedef struct {
     mbedtls_x509_crt remoteCertificate;
 } Basic128Rsa15_ChannelContext;
 
-
 /********************/
 /* AsymmetricModule */
 /********************/

plugins/ua_securitypolicy_basic128rsa15.h

@@ -1,25 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. 
- *
- *    Copyright 2018 (c) Mark Giraud, Fraunhofer IOSB
- */
-
-#ifndef UA_SECURITYPOLICY_BASIC128RSA15_H_
-#define UA_SECURITYPOLICY_BASIC128RSA15_H_
-
-#include "ua_plugin_securitypolicy.h"
-#include "ua_plugin_log.h"
-
-_UA_BEGIN_DECLS
-
-UA_EXPORT UA_StatusCode
-UA_SecurityPolicy_Basic128Rsa15(UA_SecurityPolicy *policy,
-                                UA_CertificateVerification *certificateVerification,
-                                const UA_ByteString localCertificate,
-                                const UA_ByteString localPrivateKey,
-                                UA_Logger logger);
-
-_UA_END_DECLS
-
-#endif /* UA_SECURITYPOLICY_BASIC128RSA15_H_ */

plugins/ua_securitypolicy_basic256sha256.c

@@ -17,10 +17,9 @@
 #include <mbedtls/version.h>
 #include <mbedtls/sha1.h>
 
-#include "ua_plugin_pki.h"
-#include "ua_plugin_securitypolicy.h"
-#include "ua_securitypolicy_basic256sha256.h"
 #include "ua_types.h"
+#include "ua_plugin_pki.h"
+#include "ua_securitypolicies.h"
 #include "ua_types_generated_handling.h"
 
 /* Notes:

plugins/ua_securitypolicy_basic256sha256.h

@@ -1,26 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- *    Copyright 2018 (c) Mark Giraud, Fraunhofer IOSB
- *    Copyright 2018 (c) Daniel Feist, Precitec GmbH & Co. KG
- */
-
-#ifndef UA_SECURITYPOLICY_BASIC256SHA256_H_
-#define UA_SECURITYPOLICY_BASIC256SHA256_H_
-
-#include "ua_plugin_securitypolicy.h"
-#include "ua_plugin_log.h"
-
-_UA_BEGIN_DECLS
-
-UA_EXPORT UA_StatusCode
-UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
-                                 UA_CertificateVerification *certificateVerification,
-                                 const UA_ByteString localCertificate,
-                                 const UA_ByteString localPrivateKey,
-                                 UA_Logger logger);
-
-_UA_END_DECLS
-
-#endif /* UA_SECURITYPOLICY_BASIC256SHA256_H_ */

plugins/ua_securitypolicy_none.c

@@ -6,7 +6,7 @@
  */
 
 #include "ua_types.h"
-#include "ua_securitypolicy_none.h"
+#include "ua_securitypolicies.h"
 #include "ua_types_generated_handling.h"
 
 static UA_StatusCode

plugins/ua_securitypolicy_none.h

@@ -1,21 +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. 
- *
- *    Copyright 2017 (c) Mark Giraud, Fraunhofer IOSB
- *    Copyright 2017 (c) Stefan Profanter, fortiss GmbH
- */
-
-#ifndef UA_SECURITYPOLICY_NONE_H_
-#define UA_SECURITYPOLICY_NONE_H_
-
-#include "ua_plugin_securitypolicy.h"
-
-_UA_BEGIN_DECLS
-
-UA_StatusCode UA_EXPORT
-UA_SecurityPolicy_None(UA_SecurityPolicy *policy, UA_CertificateVerification *certificateVerification,
-                       const UA_ByteString localCertificate, UA_Logger logger);
-
-_UA_END_DECLS
-
-#endif /* UA_SECURITYPOLICY_NONE_H_ */

src/client/ua_client.c

@@ -23,8 +23,7 @@
 #include "ua_types_encoding_binary.h"
 #include "ua_types_generated_encoding_binary.h"
 #include "ua_util.h"
-#include "ua_securitypolicy_none.h"
-#include "ua_securitypolicy_basic128rsa15.h"
+#include "ua_securitypolicies.h"
 #include "ua_pki_certificate.h"
 
 #define STATUS_CODE_BAD_POINTER 0x01

src/server/ua_server_binary.c

@@ -24,7 +24,6 @@
 #include "ua_transport_generated_handling.h"
 #include "ua_transport_generated_encoding_binary.h"
 #include "ua_types_generated_handling.h"
-#include "ua_securitypolicy_none.h"
 
 #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
 // store the authentication token and session ID so we can help fuzzing by setting

tests/encryption/check_encryption_basic128rsa15.c

@@ -4,19 +4,19 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "check.h"
 
 #include "ua_types.h"
 #include "ua_server.h"
 #include "ua_server_internal.h"
 #include "ua_client.h"
 #include "client/ua_client_internal.h"
-#include "ua_securitypolicy_basic128rsa15.h"
+#include "ua_securitypolicies.h"
 #include "ua_config_default.h"
 #include "ua_client_highlevel.h"
 #include "ua_network_tcp.h"
 #include "testing_clock.h"
 #include "testing_networklayers.h"
-#include "check.h"
 #include "thread_wrapper.h"
 #include "certificates.h"
 

tests/encryption/check_encryption_basic256sha256.c

@@ -4,19 +4,19 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include "check.h"
 
 #include "ua_types.h"
 #include "ua_server.h"
 #include "ua_server_internal.h"
 #include "ua_client.h"
 #include "client/ua_client_internal.h"
-#include "ua_securitypolicy_basic256sha256.h"
+#include "ua_securitypolicies.h"
 #include "ua_config_default.h"
 #include "ua_client_highlevel.h"
 #include "ua_network_tcp.h"
 #include "testing_clock.h"
 #include "testing_networklayers.h"
-#include "check.h"
 #include "thread_wrapper.h"
 #include "certificates.h"