Started implementing handling of DH Nonce attributes

src/libpts/Makefile.am

@@ -15,6 +15,7 @@ libpts_la_SOURCES = \
 	pts/pts_file_meas.h pts/pts_file_meas.c \
 	pts/pts_file_meta.h pts/pts_file_meta.c \
 	pts/pts_meas_algo.h pts/pts_meas_algo.c \
+	pts/pts_dh_group.h pts/pts_dh_group.c \
 	tcg/tcg_attr.h tcg/tcg_attr.c \
 	tcg/tcg_pts_attr_proto_caps.h tcg/tcg_pts_attr_proto_caps.c \
 	tcg/tcg_pts_attr_dh_nonce_params_req.h tcg/tcg_pts_attr_dh_nonce_params_req.c \

src/libpts/pts/pts.c

@@ -50,6 +50,21 @@ struct private_pts_t {
 	 */
 	pts_meas_algorithms_t algorithm;
 
+	/**
+	 * PTS Diffie Hellman Group
+	 */
+	pts_dh_group_t dh_group;
+
+	/**
+	 * Contains a Diffie Hellman Nonce
+	 */
+	chunk_t dh_nonce;
+
+	/**
+	 * Contains a Diffie Hellman Public Value
+	 */
+	chunk_t dh_public_value;
+
 	/**
 	 * Platform and OS Info
 	 */
@@ -110,6 +125,26 @@ METHOD(pts_t, set_meas_algorithm, void,
 	}
 }
 
+METHOD(pts_t, get_dh_group, pts_dh_group_t,
+	   private_pts_t *this)
+{
+	return this->dh_group;
+}
+
+METHOD(pts_t, set_dh_group, void,
+	   private_pts_t *this, pts_dh_group_t group)
+{
+	diffie_hellman_group_t dh_group;
+
+	dh_group = pts_dh_group_to_strongswan_dh_group(group);
+	DBG2(DBG_PTS, "selected PTS Diffie Hellman Group is %N",
+		 diffie_hellman_group_names, dh_group);
+	if (dh_group != MODP_NONE)
+	{
+		this->dh_group = dh_group;
+	}
+}
+
 /**
  * Print TPM 1.2 Version Info
  */
@@ -518,6 +553,8 @@ METHOD(pts_t, destroy, void,
 	   private_pts_t *this)
 {
 	DESTROY_IF(this->aik);
+	free(this->dh_nonce.ptr);
+	free(this->dh_public_value.ptr);
 	free(this->platform_info);
 	free(this->tpm_version_info.ptr);
 	free(this);
@@ -683,6 +720,8 @@ pts_t *pts_create(bool is_imc)
 			 .set_proto_caps = _set_proto_caps,
 			 .get_meas_algorithm = _get_meas_algorithm,
 			 .set_meas_algorithm = _set_meas_algorithm,
+			 .get_dh_group = _get_dh_group,
+			 .set_dh_group = _set_dh_group,
 			 .get_platform_info = _get_platform_info,
 			 .set_platform_info = _set_platform_info,
 			 .get_tpm_version_info = _get_tpm_version_info,
@@ -696,6 +735,7 @@ pts_t *pts_create(bool is_imc)
 		 },
 		 .proto_caps = PTS_PROTO_CAPS_V,
 		 .algorithm = PTS_MEAS_ALGO_SHA256,
+		 .dh_group = PTS_DH_GROUP_IKE19,
 	);
 
 	if (is_imc)

src/libpts/pts/pts.h

@@ -28,6 +28,7 @@ typedef struct pts_t pts_t;
 #include "pts_meas_algo.h"
 #include "pts_file_meas.h"
 #include "pts_file_meta.h"
+#include "pts_dh_group.h"
 
 #include <library.h>
 
@@ -71,6 +72,20 @@ struct pts_t {
 	 */
 	void (*set_meas_algorithm)(pts_t *this, pts_meas_algorithms_t algorithm);
 
+	/**
+	 * Get PTS Diffie Hellman Group
+	 *
+	 * @return				DH Group
+	 */
+	pts_dh_group_t (*get_dh_group)(pts_t *this);
+
+	/**
+	 * Set PTS Diffie Hellman Group
+	 *
+	 * @param dh_group		DH Group
+	 */
+	void (*set_dh_group)(pts_t *this, pts_dh_group_t dh_group);
+
 	/**
 	 * Get Platform and OS Info
 	 *

src/libpts/pts/pts_dh_group.c

@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2011 Sansar Choinyambuu
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include "pts_dh_group.h"
+
+#include <debug.h>
+
+/**
+ * Described in header.
+ */
+bool pts_probe_dh_groups(pts_dh_group_t *groups)
+{
+	enumerator_t *enumerator;
+	diffie_hellman_group_t dh_group;
+	const char *plugin_name;
+	char format1[] = "  %s PTS Diffie Hellman Group %N[%s] available";
+	char format2[] = "  %s PTS Diffie Hellman Group %N[%s] not available";
+	
+	*groups = 0;
+
+	enumerator = lib->crypto->create_dh_enumerator(lib->crypto);
+	while (enumerator->enumerate(enumerator, &dh_group, &plugin_name))
+	{
+		DBG2(DBG_PTS, format1, "Following ", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		
+		if (dh_group == MODP_1024_BIT)
+		{
+			*groups |= PTS_DH_GROUP_IKE2;
+			DBG2(DBG_PTS, format1, "optional", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		}
+		else if (dh_group == MODP_1536_BIT)
+		{
+			*groups |= PTS_DH_GROUP_IKE5;
+			DBG2(DBG_PTS, format1, "optional", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		}
+		else if (dh_group == MODP_2048_BIT)
+		{
+			*groups |= PTS_DH_GROUP_IKE14;
+			DBG2(DBG_PTS, format1, "optional", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		}
+		else if (dh_group == ECP_256_BIT)
+		{
+			*groups |= PTS_DH_GROUP_IKE19;
+			DBG2(DBG_PTS, format1, "mandatory", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		}
+		else if (dh_group == ECP_384_BIT)
+		{
+			*groups |= PTS_DH_GROUP_IKE20;
+			DBG2(DBG_PTS, format1, "optional", diffie_hellman_group_names, dh_group,
+								  plugin_name);
+		}
+	}
+	enumerator->destroy(enumerator);
+
+	if (*groups & PTS_DH_GROUP_IKE19)
+	{
+		return TRUE;
+	}
+	else
+	{
+		DBG1(DBG_PTS, format2, "mandatory", diffie_hellman_group_names, ECP_256_BIT, plugin_name);
+	}
+
+	/* TODO: return FALSE : Elliptic Curves are not available */
+	return TRUE;
+	
+}
+
+/**
+ * Described in header.
+ */
+bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups)
+{
+	if (strcaseeq(dh_group, "ike20"))
+	{
+		/* nothing to update, all groups are supported */
+		return TRUE;
+	}
+	else if (strcaseeq(dh_group, "ike19"))
+	{
+		/* remove DH Group 20 */
+		*groups = ~PTS_DH_GROUP_IKE20;
+		return TRUE;
+	}
+	else if (strcaseeq(dh_group, "ike14"))
+	{
+		/* remove DH Group 19 and 20 */
+		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19;
+		return TRUE;
+	}
+	else if (strcaseeq(dh_group, "ike5"))
+	{
+		/* remove DH Group 14, 19 and 20 */
+		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19
+		| ~PTS_DH_GROUP_IKE14;
+		return TRUE;
+	}
+	else if (strcaseeq(dh_group, "ike2"))
+	{
+		/* remove DH Group 5, 14, 19 and 20 */
+		*groups = ~PTS_DH_GROUP_IKE20 | ~PTS_DH_GROUP_IKE19 |
+		~PTS_DH_GROUP_IKE14 | ~PTS_DH_GROUP_IKE5;
+		return TRUE;
+	}
+
+	DBG1(DBG_PTS, "Unknown DH Group: %s configured");
+	return FALSE;
+}
+
+/**
+ * Described in header.
+ */
+diffie_hellman_group_t pts_dh_group_to_strongswan_dh_group(pts_dh_group_t dh_group)
+{
+	switch (dh_group)
+	{
+		case PTS_DH_GROUP_IKE2:
+			return MODP_1024_BIT;
+		case PTS_DH_GROUP_IKE5:
+			return MODP_1536_BIT;
+		case PTS_DH_GROUP_IKE14:
+			return MODP_2048_BIT;
+		case PTS_DH_GROUP_IKE19:
+			return ECP_256_BIT;
+		case PTS_DH_GROUP_IKE20:
+			return ECP_384_BIT;
+		default:
+			return MODP_NONE;
+	}
+}

src/libpts/pts/pts_dh_group.h

@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2011 Sansar Choinyambuu
+ * HSR Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+/**
+ * @defgroup pts_dh_group pts_dh_group
+ * @{ @ingroup pts
+ */
+
+#ifndef PTS_DH_GROUP_H_
+#define PTS_DH_GROUP_H_
+
+#include <library.h>
+#include <crypto/diffie_hellman.h>
+
+typedef enum pts_dh_group_t pts_dh_group_t;
+
+/**
+ * PTS Diffie Hellman Group Values
+ */
+enum pts_dh_group_t {
+	/** IKE Group 2 */
+	PTS_DH_GROUP_IKE2 =					 (1<<15),
+	/** IKE Group 5 */
+	PTS_DH_GROUP_IKE5 =					 (1<<14),
+	/** IKE Group 14 */
+	PTS_DH_GROUP_IKE14 =				 (1<<13),
+	/** IKE Group 19 */
+	PTS_DH_GROUP_IKE19 =				 (1<<12),
+	/** IKE Group 20 */
+	PTS_DH_GROUP_IKE20 =				 (1<<11),
+};
+
+/**
+ * Diffie-Hellman Group Values
+ * see section 3.8.6 of PTS Protocol: Binding to TNC IF-M Specification
+ *
+ *					   1
+ *   0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  |1|2|3|4|5|R|R|R|R|R|R|R|R|R|R|R|
+ *  +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+ *  
+ */
+
+/**
+ * Probe available PTS measurement algorithms
+ *
+ * @param groups		set of available groups
+ * @return				TRUE if mandatory group PTS_DH_GROUP_IKE19 is available
+ */
+bool pts_probe_dh_groups(pts_dh_group_t *groups);
+
+/**
+ * Update supported Diffie Hellman Groups according to configuration
+ *
+ * @param dh_group		configured Diffie Hellman Group
+ * @param groups		set of available groups
+ */
+bool pts_update_supported_dh_groups(char *dh_group, pts_dh_group_t *groups);
+
+/**
+ * Convert pts_dh_group_t to diffie_hellman_group_t
+ *
+ * @param dh_group		PTS Diffie Hellman Group type
+ * @return				libstrongswan diffie hellman group type
+ */
+diffie_hellman_group_t pts_dh_group_to_strongswan_dh_group(pts_dh_group_t dh_group);
+
+#endif /** PTS_DH_GROUP_H_ @}*/

src/libpts/tcg/tcg_attr.c

@@ -160,11 +160,11 @@ pa_tnc_attr_t* tcg_attr_create_from_data(u_int32_t type, chunk_t value)
 		case TCG_PTS_PROTO_CAPS:
 			return tcg_pts_attr_proto_caps_create_from_data(value, FALSE);
 		case TCG_PTS_DH_NONCE_PARAMS_REQ:
-			return tcg_pts_attr_dh_nonce_params_req_create(value);
+			return tcg_pts_attr_dh_nonce_params_req_create_from_data(value);
 		case TCG_PTS_DH_NONCE_PARAMS_RESP:
-			return tcg_pts_attr_dh_nonce_params_resp_create(value);
+			return tcg_pts_attr_dh_nonce_params_resp_create_from_data(value);
 		case TCG_PTS_DH_NONCE_FINISH:
-			return tcg_pts_attr_dh_nonce_finish_create(value);
+			return tcg_pts_attr_dh_nonce_finish_create_from_data(value);
 		case TCG_PTS_MEAS_ALGO:
 			return tcg_pts_attr_meas_algo_create_from_data(value, FALSE);
 		case TCG_PTS_MEAS_ALGO_SELECTION:

src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.c

@@ -115,9 +115,9 @@ METHOD(pa_tnc_attr_t, build, void,
 	bio_writer_t *writer;
 
 	writer = bio_writer_create(PTS_DH_NONCE_PARAMS_REQ_SIZE);
-	writer->write_uint8(writer, PTS_DH_NONCE_PARAMS_REQ_RESERVED);
-	writer->write_uint8(writer, this->min_nonce_len);
-	writer->write_uint8(writer, this->dh_groups);
+	writer->write_uint8 (writer, PTS_DH_NONCE_PARAMS_REQ_RESERVED);
+	writer->write_uint8 (writer, this->min_nonce_len);
+	writer->write_uint16(writer, this->dh_groups);
 	
 	this->value = chunk_clone(writer->get_buf(writer));
 	writer->destroy(writer);

src/libpts/tcg/tcg_pts_attr_dh_nonce_params_req.h

@@ -22,26 +22,10 @@
 #define TCG_PTS_ATTR_DH_NONCE_PARAMS_REQ_H_
 
 typedef struct tcg_pts_attr_dh_nonce_params_req_t tcg_pts_attr_dh_nonce_params_req_t;
-typedef enum pts_dh_group_t pts_dh_group_t;
 
 #include "tcg_attr.h"
 #include "pa_tnc/pa_tnc_attr.h"
-
-/**
- * PTS Diffie Hellman Group Values
- */
-enum pts_dh_group_t {
-	/** IKE Group 2 */
-	PTS_DH_GROUP_IKE2 =					 (1<<15),
-	/** IKE Group 5 */
-	PTS_DH_GROUP_IKE5 =					 (1<<14),
-	/** IKE Group 14 */
-	PTS_DH_GROUP_IKE14 =				 (1<<13),
-	/** IKE Group 19, Elliptic curves using NIST 256 bit prime modules */
-	PTS_DH_GROUP_IKE19 =				 (1<<12),
-	/** IKE Group 20, Elliptic curves using NIST 384 bit prime modules */
-	PTS_DH_GROUP_IKE20 =				 (1<<11),
-};
+#include "pts/pts_dh_group.h"
 
 /**
  * Class implementing the TCG PTS DH Nonce Parameters Request Attribute

src/libpts/tcg/tcg_pts_attr_dh_nonce_params_resp.h

@@ -25,7 +25,7 @@ typedef struct tcg_pts_attr_dh_nonce_params_resp_t tcg_pts_attr_dh_nonce_params_
 
 #include "tcg_attr.h"
 #include "pa_tnc/pa_tnc_attr.h"
-#include "tcg_pts_attr_dh_nonce_params_req.h"
+#include "pts/pts_dh_group.h"
 #include "pts/pts_meas_algo.h"
 
 /**