Fixed compile errors
Merge branch 'master' of github.com:vtsingaras/strongswan