Fix various 7.0-porting issues in the deploy-sign implementation

livecodefraser · livecodefraser · commit 06a9430964c6 · 2015-07-15T12:29:21.000+01:00
diff --git a/engine/src/deploy.cpp b/engine/src/deploy.cpp
@@ -742,11 +742,11 @@ void MCIdeSign::exec_ctxt(MCExecContext &ctxt)
 			ctxt . Throw();
 	
 	if (!ctxt . HasError())
-		if (t_params . certstore != NULL && (t_params . certificate != NULL || t_params . privatekey != NULL))
+		if (!MCValueIsEmpty(t_params . certstore) && (!MCValueIsEmpty(t_params . certificate) || !MCValueIsEmpty(t_params . privatekey)))
 			ctxt . Throw();
 
 	if (!ctxt . HasError())
-		if (t_params . certstore == NULL && (t_params . certificate == NULL || t_params . privatekey == NULL))
+		if (MCValueIsEmpty(t_params . certstore) && (MCValueIsEmpty(t_params . certificate) || MCValueIsEmpty(t_params . privatekey)))
 			ctxt . Throw();
 
 	bool t_can_sign;
diff --git a/engine/src/deploy_sign.cpp b/engine/src/deploy_sign.cpp
@@ -937,10 +937,8 @@ static bool MCDeploySignWindowsAddTimeStamp(const MCDeploySignParameters& p_para
 			t_data . setnext(&t_url);
 			t_url . setvalueref_argument(p_params . timestamper);
             extern MCExecContext *MCECptr;
-            // SN-2014-05-09 [[ ClearResult ]]
-            // isempty is different from isclear - 'isempty' returns false for a cleared result
 			if (MCECptr->GetObject() -> message(MCM_post_url, &t_data, False, True) == ES_NORMAL &&
-				MCresult -> isclear())
+				MCresult -> isempty())
 			{
 				t_failed = false;
 				break;
@@ -1072,7 +1070,7 @@ bool MCDeploySignWindows(const MCDeploySignParameters& p_params)
 	EVP_PKEY* t_privatekey;
 	t_cert_chain = nil;
 	t_privatekey = nil;
-	if (t_success && p_params . certstore != nil)
+	if (t_success && !MCValueIsEmpty(p_params . certstore))
         t_success = MCDeployCertStoreLoad(p_params . passphrase,
                                           p_params . certstore,
 										  t_cert_chain, t_privatekey);
@@ -1250,7 +1248,7 @@ bool MCDeploySignWindows(const MCDeploySignParameters& p_params)
 
 	// Now we have our signature, we timestamp it - but only if we were
 	// given a timestamp authority url.
-	if (t_success && p_params . timestamper != nil)
+	if (t_success && !MCValueIsEmpty(p_params . timestamper))
 		t_success = MCDeploySignWindowsAddTimeStamp(p_params, t_signature);
 
 	// We now have a complete PKCS7 SignedData object which is now serialized.
