From: Martin Willi <martin@strongswan.org>
Date: Fri, 9 Oct 2009 07:03:13 +0000 (+0200)
Subject: Do not use monotonic time for AKA sequence numbers, it has an undefined starting... 
X-Git-Tag: 4.3.5rc1~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=424ddf801c2150fb38da603bba88e7254477242d;p=thirdparty%2Fstrongswan.git

Do not use monotonic time for AKA sequence numbers, it has an undefined starting point
---

diff --git a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c b/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
index af20ead38a..10e03c83c2 100644
--- a/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
+++ b/src/charon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_provider.c
@@ -75,14 +75,12 @@ void eap_aka_3gpp2_get_sqn(char sqn[AKA_SQN_LEN], int offset)
 {
 	timeval_t time;
 
-	time_monotonic(&time);
-	/* set sqn to an integer containing seconds followed by most
-	 * significant useconds */
+	gettimeofday(&time, NULL);
+	/* set sqn to an integer containing 4 bytes seconds + 2 bytes usecs */
 	time.tv_sec = htonl(time.tv_sec + offset);
 	/* usec's are never larger than 0x000f423f, so we shift the 12 first bits */
-	time.tv_usec <<= 12;
-	time.tv_usec = htonl(time.tv_usec);
-	memcpy(sqn, &time.tv_sec, 4);
+	time.tv_usec = htonl(time.tv_usec << 12);
+	memcpy(sqn, (char*)&time.tv_sec + sizeof(time_t) - 4, 4);
 	memcpy(sqn + 4, &time.tv_usec, 2);
 }