Merge pull request #2226 from lluixhi/master

Fix build with LibreSSL >= 2.2.2