ike: Do not cache MID of IKEv2 fragments

This fails if there are unencrypted payloads before an encrypted
fragment payload in the first fragment.

diff --git a/src/libcharon/sa/ike_sa_manager.c b/src/libcharon/sa/ike_sa_manager.c
index 8ffa93fda152998ad1b1122908ee260011c9316d..bdabc59b5a9a4974faa6e52f0d2657b9cc3ac18e 100644 (file)
--- a/src/libcharon/sa/ike_sa_manager.c
+++ b/src/libcharon/sa/ike_sa_manager.c
@@ -1302,8 +1302,9 @@ METHOD(ike_sa_manager_t, checkout_by_message, ike_sa_t*,
 
                        ike_id = entry->ike_sa->get_id(entry->ike_sa);
                        entry->checked_out = TRUE;
-                       if (message->get_first_payload_type(message) != PLV1_FRAGMENT)
-                       {
+                       if (message->get_first_payload_type(message) != PLV1_FRAGMENT &&
+                               message->get_first_payload_type(message) != PLV2_FRAGMENT)
+                       {       /* TODO-FRAG: this fails if there are unencrypted payloads */
                                entry->processing = get_message_id_or_hash(message);
                        }
                        if (ike_id->get_responder_spi(ike_id) == 0)