refactor(server): Rename deleteMembers to clear in UA_SecurityPolicy

include/open62541/plugin/securitypolicy.h

@@ -358,7 +358,7 @@ struct UA_SecurityPolicy {
                                                     const UA_ByteString newPrivateKey);
 
     /* Deletes the dynamic content of the policy */
-    void (*deleteMembers)(UA_SecurityPolicy *policy);
+    void (*clear)(UA_SecurityPolicy *policy);
 };
 
 /* Gets the number of bytes that are needed by the encryption function in

plugins/securityPolicies/ua_securitypolicy_basic128rsa15.c

@@ -578,7 +578,7 @@ channelContext_compareCertificate_sp_basic128rsa15(const Basic128Rsa15_ChannelCo
 }
 
 static void
-deleteMembers_sp_basic128rsa15(UA_SecurityPolicy *securityPolicy) {
+clear_sp_basic128rsa15(UA_SecurityPolicy *securityPolicy) {
     if(securityPolicy == NULL)
         return;
 
@@ -648,7 +648,7 @@ updateCertificateAndPrivateKey_sp_basic128rsa15(UA_SecurityPolicy *securityPolic
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not update certificate and private key");
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic128rsa15(securityPolicy);
+        clear_sp_basic128rsa15(securityPolicy);
     return retval;
 }
 
@@ -733,7 +733,7 @@ error:
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not create securityContext: %s", UA_StatusCode_name(retval));
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic128rsa15(securityPolicy);
+        clear_sp_basic128rsa15(securityPolicy);
     return retval;
 }
 
@@ -869,7 +869,7 @@ UA_SecurityPolicy_Basic128Rsa15(UA_SecurityPolicy *policy,
         channelContext_compareCertificate_sp_basic128rsa15;
 
     policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_basic128rsa15;
-    policy->deleteMembers = deleteMembers_sp_basic128rsa15;
+    policy->clear = clear_sp_basic128rsa15;
 
     return policyContext_newContext_sp_basic128rsa15(policy, localPrivateKey);
 }

plugins/securityPolicies/ua_securitypolicy_basic256.c

@@ -18,7 +18,6 @@
 #include <open62541/types.h>
 #include <open62541/util.h>
 
-
 #include <mbedtls/aes.h>
 #include <mbedtls/entropy.h>
 #include <mbedtls/entropy_poll.h>
@@ -527,7 +526,7 @@ channelContext_compareCertificate_sp_basic256(const Basic256_ChannelContext *cc,
 }
 
 static void
-deleteMembers_sp_basic256(UA_SecurityPolicy *securityPolicy) {
+clear_sp_basic256(UA_SecurityPolicy *securityPolicy) {
     if(securityPolicy == NULL)
         return;
 
@@ -599,7 +598,7 @@ updateCertificateAndPrivateKey_sp_basic256(UA_SecurityPolicy *securityPolicy,
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not update certificate and private key");
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic256(securityPolicy);
+        clear_sp_basic256(securityPolicy);
     return retval;
 }
 
@@ -683,7 +682,7 @@ error:
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not create securityContext: %s", UA_StatusCode_name(retval));
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic256(securityPolicy);
+        clear_sp_basic256(securityPolicy);
     return retval;
 }
 
@@ -819,7 +818,7 @@ UA_SecurityPolicy_Basic256(UA_SecurityPolicy *policy,
         channelContext_compareCertificate_sp_basic256;
 
     policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_basic256;
-    policy->deleteMembers = deleteMembers_sp_basic256;
+    policy->clear = clear_sp_basic256;
 
     return policyContext_newContext_sp_basic256(policy, localPrivateKey);
 }

plugins/securityPolicies/ua_securitypolicy_basic256sha256.c

@@ -568,7 +568,7 @@ channelContext_compareCertificate_sp_basic256sha256(const Basic256Sha256_Channel
 }
 
 static void
-deleteMembers_sp_basic256sha256(UA_SecurityPolicy *securityPolicy) {
+clear_sp_basic256sha256(UA_SecurityPolicy *securityPolicy) {
     if(securityPolicy == NULL)
         return;
 
@@ -639,7 +639,7 @@ updateCertificateAndPrivateKey_sp_basic256sha256(UA_SecurityPolicy *securityPoli
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not update certificate and private key");
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic256sha256(securityPolicy);
+        clear_sp_basic256sha256(securityPolicy);
     return retval;
 }
 
@@ -723,7 +723,7 @@ error:
     UA_LOG_ERROR(securityPolicy->logger, UA_LOGCATEGORY_SECURITYPOLICY,
                  "Could not create securityContext: %s", UA_StatusCode_name(retval));
     if(securityPolicy->policyContext != NULL)
-        deleteMembers_sp_basic256sha256(securityPolicy);
+        clear_sp_basic256sha256(securityPolicy);
     return retval;
 }
 
@@ -859,7 +859,7 @@ UA_SecurityPolicy_Basic256Sha256(UA_SecurityPolicy *policy,
         channelContext_compareCertificate_sp_basic256sha256;
 
     policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_sp_basic256sha256;
-    policy->deleteMembers = deleteMembers_sp_basic256sha256;
+    policy->clear = clear_sp_basic256sha256;
 
     return policyContext_newContext_sp_basic256sha256(policy, localPrivateKey);
 }

plugins/securityPolicies/ua_securitypolicy_none.c

@@ -122,7 +122,7 @@ updateCertificateAndPrivateKey_none(UA_SecurityPolicy *policy,
 
 
 static void
-policy_deletemembers_none(UA_SecurityPolicy *policy) {
+policy_clear_none(UA_SecurityPolicy *policy) {
     UA_ByteString_deleteMembers(&policy->localCertificate);
 }
 
@@ -181,7 +181,7 @@ UA_SecurityPolicy_None(UA_SecurityPolicy *policy,
     policy->channelModule.setRemoteSymIv = setContextValue_none;
     policy->channelModule.compareCertificate = compareCertificate_none;
     policy->updateCertificateAndPrivateKey = updateCertificateAndPrivateKey_none;
-    policy->deleteMembers = policy_deletemembers_none;
+    policy->clear = policy_clear_none;
 
     return UA_STATUSCODE_GOOD;
 }

src/client/ua_client.c

@@ -71,7 +71,7 @@ UA_ClientConfig_deleteMembers(UA_ClientConfig *config) {
     if(config->securityPolicies == 0)
         return;
     for(size_t i = 0; i < config->securityPoliciesSize; i++)
-        config->securityPolicies[i].deleteMembers(&config->securityPolicies[i]);
+        config->securityPolicies[i].clear(&config->securityPolicies[i]);
     UA_free(config->securityPolicies);
     config->securityPolicies = 0;
 }

src/server/ua_server_config.c

@@ -34,7 +34,7 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
 
     for(size_t i = 0; i < config->securityPoliciesSize; ++i) {
         UA_SecurityPolicy *policy = &config->securityPolicies[i];
-        policy->deleteMembers(policy);
+        policy->clear(policy);
     }
     UA_free(config->securityPolicies);
     config->securityPolicies = NULL;

tests/check_securechannel.c

@@ -53,7 +53,7 @@ static void
 teardown_secureChannel(void) {
     UA_SecureChannel_close(&testChannel);
     UA_SecureChannel_deleteMembers(&testChannel);
-    dummyPolicy.deleteMembers(&dummyPolicy);
+    dummyPolicy.clear(&dummyPolicy);
     testingConnection.close(&testingConnection);
 }
 
@@ -109,7 +109,7 @@ START_TEST(SecureChannel_initAndDelete) {
     UA_SecureChannel_deleteMembers(&channel);
     ck_assert_msg(fCalled.deleteContext, "Expected deleteContext to have been called");
 
-    dummyPolicy.deleteMembers(&dummyPolicy);
+    dummyPolicy.clear(&dummyPolicy);
 }END_TEST
 
 START_TEST(SecureChannel_generateNewKeys) {

tests/server/check_server_monitoringspeed.c

@@ -39,7 +39,7 @@ static void setup(void) {
 static void teardown(void) {
     UA_SecureChannel_close(&testChannel);
     UA_SecureChannel_deleteMembers(&testChannel);
-    dummyPolicy.deleteMembers(&dummyPolicy);
+    dummyPolicy.clear(&dummyPolicy);
     testingConnection.close(&testingConnection);
 
     UA_Server_delete(server);

tests/server/check_server_readspeed.c

@@ -40,7 +40,7 @@ static void setup(void) {
 static void teardown(void) {
     UA_SecureChannel_close(&testChannel);
     UA_SecureChannel_deleteMembers(&testChannel);
-    dummyPolicy.deleteMembers(&dummyPolicy);
+    dummyPolicy.clear(&dummyPolicy);
     testingConnection.close(&testingConnection);
 
     UA_Server_delete(server);

tests/server/check_server_speed_addnodes.c

@@ -40,7 +40,7 @@ static void setup(void) {
 static void teardown(void) {
     UA_SecureChannel_close(&testChannel);
     UA_SecureChannel_deleteMembers(&testChannel);
-    dummyPolicy.deleteMembers(&dummyPolicy);
+    dummyPolicy.clear(&dummyPolicy);
     testingConnection.close(&testingConnection);
     UA_Server_delete(server);
 }

tests/testing-plugins/testing_policy.c

@@ -371,7 +371,7 @@ compareCertificate_testing(const void *channelContext,
 }
 
 static void
-policy_deletemembers_testing(UA_SecurityPolicy *policy) {
+policy_clear_testing(UA_SecurityPolicy *policy) {
     UA_ByteString_deleteMembers(&policy->localCertificate);
 }
 
@@ -437,7 +437,7 @@ TestingPolicy(UA_SecurityPolicy *policy, UA_ByteString localCertificate,
     policy->channelModule.setRemoteSymSigningKey = setRemoteSymSigningKey_testing;
     policy->channelModule.setRemoteSymIv = setRemoteSymIv_testing;
     policy->channelModule.compareCertificate = compareCertificate_testing;
-    policy->deleteMembers = policy_deletemembers_testing;
+    policy->clear = policy_clear_testing;
 
     return UA_STATUSCODE_GOOD;
 }