From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sun, 9 Oct 2011 13:39:25 +0000 (+0200)
Subject: moved comments
X-Git-Tag: 4.6.2~328
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cae9bc9b59a7707037f173195f62291b0b1fc9b2;p=thirdparty%2Fstrongswan.git

moved comments
---

diff --git a/src/libimcv/plugins/imv_attestation/imv_attestation.c b/src/libimcv/plugins/imv_attestation/imv_attestation.c
index 0304059495..329f03e2f1 100644
--- a/src/libimcv/plugins/imv_attestation/imv_attestation.c
+++ b/src/libimcv/plugins/imv_attestation/imv_attestation.c
@@ -116,31 +116,8 @@ TNC_Result TNC_IMV_Initialize(TNC_IMVID imv_id,
 		return TNC_RESULT_NO_COMMON_VERSION;
 	}
 
-	/**
-	 * Specify supported PTS measurement algorithms
-	 *
-	 * sha1 :  PTS_MEAS_ALGO_SHA1
-	 * sha256: PTS_MEAS_ALGO_SHA1 | PTS_MEAS_ALGO_SHA256
-	 * sha384: PTS_MEAS_ALGO_SHA1 | PTS_MEAS_ALGO_SHA256 | PTS_MEAS_ALGO_SHA384
-	 *
-	 * we expect the PTS-IMC to select the strongest supported algorithm
-	 */
 	hash_alg = lib->settings->get_str(lib->settings,
 				"libimcv.plugins.imv-attestation.hash_algorithm", "sha256");
-	
-	/**
-	 * Specify supported PTS Diffie-Hellman groups
-	 *
-	 * modp1024: PTS_DH_GROUP_IKE2
-	 * modp1536: PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5
-	 * modp2048: PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14
-	 * ecp256:   PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14 |
-	 *           PTS_DH_GROUP_IKE19
-	 * ecp384:   PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14 |
-	 *           PTS_DH_GROUP_IKE19 | PTS_DH_GROUP_IKE20
-	 *
-	 * we expect the PTS-IMC to select the strongest supported group
-	 */
 	dh_group = lib->settings->get_str(lib->settings,
 				"libimcv.plugins.imv-attestation.dh_group", "ecp256");
 
diff --git a/src/libpts/pts/pts_dh_group.h b/src/libpts/pts/pts_dh_group.h
index 9a6fd1bd6e..8664a4b84c 100644
--- a/src/libpts/pts/pts_dh_group.h
+++ b/src/libpts/pts/pts_dh_group.h
@@ -67,6 +67,16 @@ bool pts_dh_group_probe(pts_dh_group_t *dh_groups);
 /**
  * Update supported Diffie-Hellman groups according to configuration
  *
+ * modp1024: PTS_DH_GROUP_IKE2
+ * modp1536: PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5
+ * modp2048: PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14
+ * ecp256:   PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14 |
+ *           PTS_DH_GROUP_IKE19
+ * ecp384:   PTS_DH_GROUP_IKE2  | PTS_DH_GROUP_IKE5  | PTS_DH_GROUP_IKE14 |
+ *           PTS_DH_GROUP_IKE19 | PTS_DH_GROUP_IKE20
+ *
+ * The PTS-IMC is expected to select the strongest supported group
+ *
  * @param dh_group			configured DH group
  * @param dh_groups			returns set of available DH groups
  */
diff --git a/src/libpts/pts/pts_meas_algo.h b/src/libpts/pts/pts_meas_algo.h
index 5935617de2..90fa7ef609 100644
--- a/src/libpts/pts/pts_meas_algo.h
+++ b/src/libpts/pts/pts_meas_algo.h
@@ -59,6 +59,12 @@ bool pts_meas_algo_probe(pts_meas_algorithms_t *algorithms);
 /**
  * Update supported PTS measurement algorithms according to configuration
  *
+ * sha1 :  PTS_MEAS_ALGO_SHA1
+ * sha256: PTS_MEAS_ALGO_SHA1 | PTS_MEAS_ALGO_SHA256
+ * sha384: PTS_MEAS_ALGO_SHA1 | PTS_MEAS_ALGO_SHA256 | PTS_MEAS_ALGO_SHA384
+ *
+ * The PTS-IMC is expected to select the strongest supported algorithm
+ *
  * @param hash_alg		configured hash algorithm
  * @param algorithms	returns set of available PTS measurement algorithms
  */