Fix mis-merge in evp-openssl.c