Okay. I think the reason it doesn't apply cleanly is because in including patches to as-yet-unmerged gpst.c, so I'll resubmit a version that applies cleanly on your master branch. -Dan On Sun, May 14, 2017 at 4:43 PM, David Woodhouse <dwmw2 at infradead.org> wrote: > On Sun, 2017-05-14 at 16:33 -0700, Daniel Lenski wrote: >> David, >> If you go on a merging spree? I just wanted to remind you that this >> patch is hanging out as well. It splits apart the ESP encryption and >> HMAC keys so that they aren't concatenated in a Juniper-specific way. >> >> I've tested it with both GlobalProtect and Juniper ESP VPNs and it >> works fine. It hasn't been merged into my GlobalProtect branch, >> however, because it isn't required for GP functionality? so if you >> don't want to merge it in this form then it's not necessary. > > Seems reasonable. Can I have a version that applies please? :)
