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

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 af20ead38a592024c6aa2b5198fb12397e19076d..10e03c83c24361dcb8b9d0b5652da6db51d0e1d9 100644 (file)
--- 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);
 }