Openssl compilation fix for 1.9.3, 1.9.2, ree
Merge pull request #2540 from grk/more-openssl-fixes

Openssl compilation fix for 1.9.3, 1.9.2, ree