From: Sansar Choinyambuu <schoinya@hsr.ch>
Date: Mon, 24 Oct 2011 10:43:38 +0000 (+0200)
Subject: Sort the pcr entries list everytime new entry is added
X-Git-Tag: 4.6.2~301
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=954be9f5e456bf586bbebc6d4ea4d588a9fca7f0;p=thirdparty%2Fstrongswan.git

Sort the pcr entries list everytime new entry is added
---

diff --git a/src/libpts/pts/pts.c b/src/libpts/pts/pts.c
index a4dda7f28d..ec5d3030c9 100644
--- a/src/libpts/pts/pts.c
+++ b/src/libpts/pts/pts.c
@@ -934,6 +934,20 @@ METHOD(pts_t, quote_tpm, bool,
 	return FALSE;
 }
 
+/**
+ * Comparison function for pcr_entry_t struct
+ */
+static int pcr_entry_compare(const pcr_entry_t *a, const pcr_entry_t *b)
+{
+	return (a->pcr_number - b->pcr_number);
+}
+
+static int pcr_entry_compare_qsort(const void *a, const void *b)
+{
+	return pcr_entry_compare(*(const pcr_entry_t *const *)a
+							, *(const pcr_entry_t *const *)b);
+}
+
 METHOD(pts_t, add_pcr_entry, void,
 	private_pts_t *this, pcr_entry_t *new)
 {
@@ -961,7 +975,8 @@ METHOD(pts_t, add_pcr_entry, void,
 	
 	this->pcrs->insert_last(this->pcrs, new);
 
-	/* TODO: Sort pcr entries with pcr index */
+	qsort(this->pcrs, this->pcrs->get_count(this->pcrs),
+		  sizeof(pcr_entry_t *), pcr_entry_compare_qsort);
 }
 
 /**