Make ssl code consistent with FIPS branch. The new code has no effect

at present because it asserts either noop flags or is inside
OPENSSL_FIPS #ifdef's.