Merge pull request #616 from reaperhulk/openssl-you-spin-me-right-round

More EVP_PKEY related shenanigans