Use EVP_PKEY_X25519, EVP_PKEY_ED25519 instead of NIDs where appropriate.