From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 7 Oct 2011 19:01:16 +0000 (+0200)
Subject: combine two algorithm checks
X-Git-Tag: 4.6.2~339
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=542b33c3500da8e6fbb13ce18aac2b2c4dec8ce7;p=thirdparty%2Fstrongswan.git

combine two algorithm checks
---

diff --git a/src/libimcv/plugins/imc_attestation/imc_attestation.c b/src/libimcv/plugins/imc_attestation/imc_attestation.c
index 9639c263ba..dab132c41e 100644
--- a/src/libimcv/plugins/imc_attestation/imc_attestation.c
+++ b/src/libimcv/plugins/imc_attestation/imc_attestation.c
@@ -98,11 +98,8 @@ TNC_Result TNC_IMC_Initialize(TNC_IMCID imc_id,
 		DBG1(DBG_IMC, "IMC \"%s\" has already been initialized", imc_name);
 		return TNC_RESULT_ALREADY_INITIALIZED;
 	}
-	if (!pts_meas_probe_algorithms(&supported_algorithms))
-	{
-		return TNC_RESULT_FATAL;
-	}
-	if (!pts_probe_dh_groups(&supported_dh_groups))
+	if (!pts_meas_probe_algorithms(&supported_algorithms) ||
+		!pts_probe_dh_groups(&supported_dh_groups))
 	{
 		return TNC_RESULT_FATAL;
 	}