combine two algorithm checks
authorAndreas Steffen <andreas.steffen@strongswan.org>
Fri, 7 Oct 2011 19:01:16 +0000 (21:01 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Mon, 28 Nov 2011 13:39:49 +0000 (14:39 +0100)
src/libimcv/plugins/imc_attestation/imc_attestation.c

index 9639c26..dab132c 100644 (file)
@@ -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;
        }
                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;
        }
        {
                return TNC_RESULT_FATAL;
        }