fix(ipsec): Prepare IPsecUtil for upcoming changes