Merge pull request #11385 from RussWhitehead/queryInst

HPCC-20040 Rename factory method in digisign

Reviewed-By: Jake Smith <jake.smith@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>

dali/base/dasess.cpp

@@ -460,7 +460,7 @@ class CDaliMessageSignatureHelper
 public:
     static void serializeSignature(const char * scope, IUserDescriptor *udesc, MemoryBuffer &mb)
     {
-		IDigitalSignatureManager * pDSM = createDigitalSignatureManagerInstanceFromEnv();
+		IDigitalSignatureManager * pDSM = queryDigitalSignatureManagerInstanceFromEnv();
 		if (pDSM && pDSM->isDigiSignerConfigured())
 		{
             //Serialize timestamp and signature of "scope;username;timestamp"

dali/server/daldap.cpp

@@ -153,7 +153,7 @@ public:
         if (!isEmptyString(reqSignature))
         {
             if (nullptr == pDSM)
-                pDSM = createDigitalSignatureManagerInstanceFromEnv();
+                pDSM = queryDigitalSignatureManagerInstanceFromEnv();
             if (pDSM && pDSM->isDigiVerifierConfigured())
             {
                 StringBuffer requestTimestamp;
@@ -262,7 +262,7 @@ public:
         if (!isEmptyString(udesc->querySignature()))
         {
             if (nullptr == pDSM)
-                pDSM = createDigitalSignatureManagerInstanceFromEnv();
+                pDSM = queryDigitalSignatureManagerInstanceFromEnv();
             if (pDSM && pDSM->isDigiVerifierConfigured())
             {
                 StringBuffer b64Signature(udesc->querySignature());

system/security/LdapSecurity/ldapsecurity.cpp

@@ -673,7 +673,7 @@ bool CLdapSecManager::authenticate(ISecUser* user)
     }
 
     //Verify provided signature if present
-    IDigitalSignatureManager * pDSM = createDigitalSignatureManagerInstanceFromEnv();
+    IDigitalSignatureManager * pDSM = queryDigitalSignatureManagerInstanceFromEnv();
     if (pDSM && pDSM->isDigiVerifierConfigured() && !isEmptyString(user->credentials().getSignature()))
     {
         StringBuffer b64Signature(user->credentials().getSignature());

system/security/digisign/digisign.cpp

@@ -291,7 +291,7 @@ static void addAlgorithms()
 extern "C"
 {
     //Returns reference to singleton instance created from environment.conf key file settings
-    DIGISIGN_API IDigitalSignatureManager * createDigitalSignatureManagerInstanceFromEnv()
+    DIGISIGN_API IDigitalSignatureManager * queryDigitalSignatureManagerInstanceFromEnv()
     {
 #if defined(_USE_OPENSSL) && !defined(_WIN32)
         std::call_once(dsmInitFlag, createDigitalSignatureManagerInstance, &dsm);

system/security/digisign/digisign.hpp

@@ -41,7 +41,7 @@ public:
 extern "C"
 {
     //Uses the HPCCPublicKey/HPCCPrivateKey key files specified in environment.conf
-    DIGISIGN_API IDigitalSignatureManager * createDigitalSignatureManagerInstanceFromEnv();
+    DIGISIGN_API IDigitalSignatureManager * queryDigitalSignatureManagerInstanceFromEnv();
 
     //Create using the given key files
     DIGISIGN_API IDigitalSignatureManager * createDigitalSignatureManagerInstanceFromFiles(const char * _pubKey, const char *_privKey, const char * _passPhrase);