From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Sat, 3 Mar 2018 18:30:55 +0000 (+0100)
Subject: libimcv: Fixed processing of PTS Simple Component Evidence
X-Git-Tag: 5.7.0dr2~3^2~5
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=66b9287cd57735dff34abae61cdf3b6046c92ddf;p=thirdparty%2Fstrongswan.git

libimcv: Fixed processing of PTS Simple Component Evidence
---

diff --git a/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
index 9438fa0628..82e18e217f 100644
--- a/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
+++ b/src/libimcv/tcg/pts/tcg_pts_attr_simple_comp_evid.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2011-2012 Sansar Choinyambuu
- * Copyright (C) 2011-2014 Andreas Steffen
+ * Copyright (C) 2011-2018 Andreas Steffen
  * HSR Hochschule fuer Technik Rapperswil
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -278,12 +278,24 @@ bool measurement_time_from_utc(time_t *measurement_time, chunk_t utc_time)
 	}
 
 	/* representation of months as 0..11 */
+	if (tm_mon < 1 || tm_mon > 12)
+	{
+		return FALSE;
+	}
 	tm_mon--;
 
 	/* representation of days as 0..30 */
+	if (tm_day < 1 || tm_day > 31)
+	{
+		return FALSE;
+	}
 	tm_day--;
 
 	/* number of leap years between last year and 1970? */
+	if (tm_year < 1970)
+	{
+		return FALSE;
+	}
 	tm_leap_4 = (tm_year - 1) / 4;
 	tm_leap_100 = tm_leap_4 / 25;
 	tm_leap_400 = tm_leap_100 / 4;
@@ -325,6 +337,7 @@ METHOD(pa_tnc_attr_t, process, status_t,
 	if (this->value.len < PTS_SIMPLE_COMP_EVID_SIZE)
 	{
 		DBG1(DBG_TNC, "insufficient data for Simple Component Evidence");
+		return FAILED;
 	}
 	reader = bio_reader_create(this->value);