Merge pull request #15406 from pprindeville/strongswan-add-chacha20poly1305