Explorar el Código

refactor(core): Replace deleteMembers with clear in UA_CertificateVerification

Julius Pfrommer hace 5 años
padre
commit
8bea4e4363

+ 1 - 1
examples/server_ctt.c

@@ -1188,7 +1188,7 @@ int main(int argc, char **argv) {
     UA_ServerConfig_setDefaultWithSecurityPolicies(&config, 4840,
                                                    &certificate, &privateKey,
                                                    NULL, 0, NULL, 0, NULL, 0);
-    config.certificateVerification.deleteMembers(&config.certificateVerification);
+    config.certificateVerification.clear(&config.certificateVerification);
     UA_CertificateVerification_CertFolders(&config.certificateVerification,
                                            trustlistFolder, issuerlistFolder,
                                            revocationlistFolder);

+ 2 - 3
include/open62541/plugin/pki.h

@@ -27,8 +27,7 @@ _UA_BEGIN_DECLS
  * Usually, implementations of the certificate verification plugin provide an
  * initialization method that takes a trust-list and a revocation-list as input.
  * The lifecycle of the plugin is attached to a server or client config. The
- * ``deleteMembers`` method is called automatically when the config is
- * destroyed. */
+ * ``clear`` method is called automatically when the config is destroyed. */
 
 struct UA_CertificateVerification;
 typedef struct UA_CertificateVerification UA_CertificateVerification;
@@ -46,7 +45,7 @@ struct UA_CertificateVerification {
                                           const UA_String *applicationURI);
 
     /* Delete the certificate verification context */
-    void (*deleteMembers)(UA_CertificateVerification *cv);
+    void (*clear)(UA_CertificateVerification *cv);
 };
 
 _UA_END_DECLS

+ 6 - 6
plugins/ua_pki_default.c

@@ -39,14 +39,14 @@ verifyApplicationURIAllowAll(void *verificationContext,
 }
 
 static void
-deleteVerifyAllowAll(UA_CertificateVerification *cv) {
+clearVerifyAllowAll(UA_CertificateVerification *cv) {
 
 }
 
 void UA_CertificateVerification_AcceptAll(UA_CertificateVerification *cv) {
     cv->verifyCertificate = verifyCertificateAllowAll;
     cv->verifyApplicationURI = verifyApplicationURIAllowAll;
-    cv->deleteMembers = deleteVerifyAllowAll;
+    cv->clear = clearVerifyAllowAll;
 }
 
 #ifdef UA_ENABLE_ENCRYPTION
@@ -486,7 +486,7 @@ certificateVerification_verifyApplicationURI(void *verificationContext,
 }
 
 static void
-certificateVerification_deleteMembers(UA_CertificateVerification *cv) {
+certificateVerification_clear(UA_CertificateVerification *cv) {
     CertInfo *ci = (CertInfo*)cv->context;
     if(!ci)
         return;
@@ -521,7 +521,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
         cv->verifyCertificate = certificateVerification_verify;
     else
         cv->verifyCertificate = verifyCertificateAllowAll;
-    cv->deleteMembers = certificateVerification_deleteMembers;
+    cv->clear = certificateVerification_clear;
     cv->verifyApplicationURI = certificateVerification_verifyApplicationURI;
 
     int err = 0;
@@ -549,7 +549,7 @@ UA_CertificateVerification_Trustlist(UA_CertificateVerification *cv,
 
     return UA_STATUSCODE_GOOD;
 error:
-    certificateVerification_deleteMembers(cv);
+    certificateVerification_clear(cv);
     return UA_STATUSCODE_BADINTERNALERROR;
 }
 
@@ -578,7 +578,7 @@ UA_CertificateVerification_CertFolders(UA_CertificateVerification *cv,
 
     cv->context = (void*)ci;
     cv->verifyCertificate = certificateVerification_verify;
-    cv->deleteMembers = certificateVerification_deleteMembers;
+    cv->clear = certificateVerification_clear;
     cv->verifyApplicationURI = certificateVerification_verifyApplicationURI;
 
     return UA_STATUSCODE_GOOD;

+ 2 - 2
src/client/ua_client.c

@@ -64,8 +64,8 @@ UA_ClientConfig_deleteMembers(UA_ClientConfig *config) {
     UA_EndpointDescription_deleteMembers(&config->endpoint);
     UA_UserTokenPolicy_deleteMembers(&config->userTokenPolicy);
 
-    if(config->certificateVerification.deleteMembers)
-        config->certificateVerification.deleteMembers(&config->certificateVerification);
+    if(config->certificateVerification.clear)
+        config->certificateVerification.clear(&config->certificateVerification);
 
     /* Delete the SecurityPolicies */
     if(config->securityPolicies == 0)

+ 2 - 2
src/server/ua_server_config.c

@@ -48,8 +48,8 @@ UA_ServerConfig_clean(UA_ServerConfig *config) {
     config->endpointsSize = 0;
 
     /* Certificate Validation */
-    if(config->certificateVerification.deleteMembers)
-        config->certificateVerification.deleteMembers(&config->certificateVerification);
+    if(config->certificateVerification.clear)
+        config->certificateVerification.clear(&config->certificateVerification);
 
     /* Access Control */
     if(config->accessControl.clear)