Revise OpenSSL fix to work with OpenSSL 1.0.0beta*