More EVP_PKEY related shenanigans

A fix for my stupidity and two more functions.