Merge pull request #2648 from reaperhulk/cleanup

small cleanup to reduce code duplication for EVP_PKEY_new calls