fix crash after openssl api change
Merge branch 'master' into portable
dh-params -> dhparams
Merge branch 'master' into portable